[evolution-exchange] Bug #641995 - Cannot build with -Wl,--as-needed

[Milan Crha <mcrha src gnome org>]

commit 2fcd8c70adf52744e737d350a89ba8ddd3f81fdd
Author: Milan Crha <mcrha redhat com>
Date:   Tue Feb 15 17:42:08 2011 +0100

    Bug #641995 - Cannot build with -Wl,--as-needed

 configure.ac             |    4 ++--
 server/lib/Makefile.am   |    1 +
 server/xntlm/Makefile.am |    3 +++
 tools/Makefile.am        |    4 +++-
 4 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e3ca651..8148b3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,13 +98,13 @@ AC_MSG_CHECKING([for Win32])
 case "$host" in
 *-mingw*)
 	os_win32=yes
-	NO_UNDEFINED='-no-undefined'
+	NO_UNDEFINED='-Wl,--no-undefined'
 	SOCKET_LIBS='-lws2_32'
 	DNS_LIBS='-ldnsapi'
 	;;
 *)
 	os_win32=no
-	NO_UNDEFINED='-no-undefined'
+	NO_UNDEFINED='-Wl,--no-undefined'
 	SOCKET_LIBS=''
 	DNS_LIBS=''
 	;;
diff --git a/server/lib/Makefile.am b/server/lib/Makefile.am
index d5d3cf7..5c441fc 100644
--- a/server/lib/Makefile.am
+++ b/server/lib/Makefile.am
@@ -71,6 +71,7 @@ libexchange_la_CPPFLAGS = \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)
 
 libexchange_la_LIBADD = \
+	$(top_builddir)/server/xntlm/libxntlm.la \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
 	$(GNOME_PLATFORM_LIBS) \
 	$(SOUP_LIBS) \
diff --git a/server/xntlm/Makefile.am b/server/xntlm/Makefile.am
index 2b61a33..fb68a89 100644
--- a/server/xntlm/Makefile.am
+++ b/server/xntlm/Makefile.am
@@ -13,4 +13,7 @@ libxntlm_la_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(GLIB_CFLAGS)
 
+libxntlm_la_LIBADD = \
+	$(GLIB_LIBS)
+
 -include $(top_srcdir)/git.mk
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3959432..e54d851 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -67,7 +67,9 @@ exchange_connector_setup_LDADD = \
 	$(DNS_LIBS)
 
 if OS_WIN32
-exchange_connector_setup_LDFLAGS = -mwindows
+exchange_connector_setup_LDFLAGS = -mwindows $(NO_UNDEFINED)
+else
+exchange_connector_setup_LDFLAGS = $(NO_UNDEFINED)
 endif
 
 install-exec-local: exchange-connector-setup EXEEXT@