diff -up evolution-2.27.2/mail/Makefile.am.fix-shared-mail evolution-2.27.2/mail/Makefile.am
--- evolution-2.27.2/mail/Makefile.am.fix-shared-mail	2009-05-24 13:35:00.000000000 -0400
+++ evolution-2.27.2/mail/Makefile.am	2009-05-29 10:23:51.000000000 -0400
@@ -31,9 +31,8 @@ INCLUDES =						\
 	-DPREFIX=\""$(prefix)"\"			\
 	-DG_LOG_DOMAIN=\"evolution-mail\"
 
-component_LTLIBRARIES = libevolution-mail-shared.la \
-			libevolution-mail.la
-
+privsolib_LTLIBRARIES = libevolution-mail-shared.la
+component_LTLIBRARIES = libevolution-mail.la
 
 # Mail.idl
 MAIL_IDL = Evolution-Mail.idl
@@ -172,9 +171,9 @@ libevolution_mail_la_LIBADD =					\
 libevolution_mail_la_LDFLAGS = 			\
 	-avoid-version -module $(NO_UNDEFINED)
 
-libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
-
-# .server files
+libevolution_mail_la_DEPENDENCIES =		\
+	em-filter-i18n.h			\
+	libevolution-mail-shared.la
 
 libevolution_mail_shared_la_SOURCES =			\
 	em-account-editor.c			\
@@ -252,10 +251,13 @@ libevolution_mail_shared_la_LIBADD =				
 	$(SMIME_LIBS)						\
 	$(THREADS_LIBS)
 
-libevolution_mail_shared_la_LDFLAGS = 			\
-	-avoid-version -module $(NO_UNDEFINED)
+libevolution_mail_shared_la_LDFLAGS = $(NO_UNDEFINED)
 
+# This forces the shared library to be installed before
+# the component library, so libtool relinking will work.
+install-componentLTLIBRARIES: install-privsolibLTLIBRARIES
 
+# .server files
 
 server_in_files = GNOME_Evolution_Mail.server.in.in
 server_DATA = $(server_in_files:.server.in.in=.server)