[evolution] Bug #594284 - Missing libraries in composer to link properly

[Milan Crha <mcrha src gnome org>]

commit 3ab9a05222b6ddee8099b871b733abd1b2d84cda
Author: Milan Crha <mcrha redhat com>
Date:   Wed Sep 16 14:31:40 2009 +0200

    Bug #594284 - Missing libraries in composer to link properly

 composer/Makefile.am |    7 ++++++-
 configure.ac         |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/composer/Makefile.am b/composer/Makefile.am
index e20f3f0..68c0d66 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -50,9 +50,14 @@ libcomposer_la_SOURCES = 			\
 	e-composer-text-header.c		\
 	e-msg-composer.c
 
+libcomposer_la_LDFLAGS = $(NO_UNDEFINED)
+
 libcomposer_la_LIBADD =					\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
-	$(top_builddir)/em-format/libemformat.la
+	$(top_builddir)/shell/libeshell.la		\
+	$(top_builddir)/em-format/libemformat.la	\
+	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la		\
+	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la
 
 uidir = $(evolutionuidir)
 ui_DATA = evolution-composer.ui
diff --git a/configure.ac b/configure.ac
index 964f27e..2358f64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,7 +203,7 @@ case "$host" in
 	;;
 *)
 	os_win32=no
-	NO_UNDEFINED=''
+	NO_UNDEFINED='-no-undefined'
 	SOEXT='.so'
 	SA_JUNK_PLUGIN=sa-junk-plugin
 	BF_JUNK_PLUGIN=bogo-junk-plugin