[evolution-exchange] Bug #630444 - Fix linking issues

[Milan Crha <mcrha src gnome org>]

commit f076c3931d8d70355ee29b0e6a4fc5e90c0bad14
Author: Milan Crha <mcrha redhat com>
Date:   Thu Nov 18 10:15:43 2010 +0100

    Bug #630444 - Fix linking issues

 configure.ac               |   15 +++++++++++++++
 server/lib/Makefile.am     |    2 +-
 server/storage/Makefile.am |    2 +-
 server/xntlm/Makefile.am   |    2 +-
 tools/Makefile.am          |    2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fcc5fcc..09a91aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,6 +225,21 @@ dnl *************************
 CONNECTOR_DATADIR='$(datadir)/evolution-exchange/$(BASE_VERSION)'
 AC_SUBST(CONNECTOR_DATADIR)
 
+privlibdir='${libdir}'/evolution-exchange/$BASE_VERSION
+AC_SUBST(privlibdir)
+
+if test "$os_win32" = yes; then
+	dnl On Win32 there is no "rpath" mechanism. We install the private
+	dnl shared libraries in $libdir, meaning the DLLs will actually be in
+	dnl $bindir. This means just having $bindir in PATH will be enough. This
+	dnl also means gnome_win32_get_prefixes() will be able to deduce the
+	dnl installation folder correctly.
+	privsolibdir=$libdir
+else
+	privsolibdir=$privlibdir
+fi
+AC_SUBST(privsolibdir)
+
 dnl *************************************
 dnl Check for evo/eds and version setting
 dnl *************************************
diff --git a/server/lib/Makefile.am b/server/lib/Makefile.am
index f188393..d5d3cf7 100644
--- a/server/lib/Makefile.am
+++ b/server/lib/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = \
+privsolib_LTLIBRARIES = \
 	libexchange.la
 
 PROP_GENERATED = e2k-propnames.h e2k-propnames.c e2k-proptags.h
diff --git a/server/storage/Makefile.am b/server/storage/Makefile.am
index 1090bc1..fec8037 100644
--- a/server/storage/Makefile.am
+++ b/server/storage/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = \
+privsolib_LTLIBRARIES = \
 	libexchange-storage.la
 
 libexchange_storage_la_CPPFLAGS = \
diff --git a/server/xntlm/Makefile.am b/server/xntlm/Makefile.am
index 9d68a04..2b61a33 100644
--- a/server/xntlm/Makefile.am
+++ b/server/xntlm/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libxntlm.la
+privsolib_LTLIBRARIES = libxntlm.la
 
 libxntlm_la_SOURCES = \
 	xntlm.c \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5655d87..3959432 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,6 @@
 noinst_PROGRAMS = exchange-connector-setup
 
-noinst_LTLIBRARIES = libevolution-exchange-shared.la
+privsolib_LTLIBRARIES = libevolution-exchange-shared.la
 
 libevolution_exchange_shared_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \