GNOME.org
 

[evolution-exchange] Some more Windows build fixes

commit c834c366bbdb7f765f13d51883af3e6b2d747104
Author: Fridrich Strba <fridrich strba bluewin ch>
Date:   Mon Mar 8 22:54:30 2010 +0100

    Some more Windows build fixes

 addressbook/Makefile.am            |    4 +++-
 calendar/Makefile.am               |    4 +++-
 camel/Makefile.am                  |    1 +
 configure.ac                       |    3 +++
 eplugin/Makefile.am                |    4 +++-
 server/lib/e2k-global-catalog.c    |    2 ++
 server/storage/Makefile.am         |    6 ------
 tools/Makefile.am                  |   14 ++++++++++----
 tools/exchange-autoconfig-wizard.c |    5 +++--
 tools/ximian-connector-setup.c     |    3 +--
 10 files changed, 29 insertions(+), 17 deletions(-)
---
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index becd016..4bea81a 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -50,8 +50,10 @@ libebookbackendexchange_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 libebookbackendexchange_la_LIBADD = \
+	$(top_builddir)/tools/libevolution-exchange-shared.la \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
-	$(top_builddir)/tools/libevolution-exchange-shared.la
+	$(PTHREAD_LIB) \
+	$(DNS_LIBS)
 
 if HAVE_LIBDB
 libebookbackendexchange_la_SOURCES += \
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index b7855a9..844e940 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -30,6 +30,8 @@ libecalbackendexchange_la_LDFLAGS = \
 libecalbackendexchange_la_LIBADD = \
 	$(top_builddir)/tools/libevolution-exchange-shared.la \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
-	$(LDAP_LIBS)
+	$(LDAP_LIBS) \
+	$(DNS_LIBS) \
+	$(PTHREAD_LIB)
 
 -include $(top_srcdir)/git.mk
diff --git a/camel/Makefile.am b/camel/Makefile.am
index ce989b4..7efc7a0 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -44,6 +44,7 @@ libcamelexchange_la_LIBADD = \
 	$(EVOLUTION_PLUGIN_LIBS) \
 	$(LDAP_LIBS) \
 	$(SOCKET_LIBS) \
+	$(DNS_LIBS) \
 	$(PTHREAD_LIB)
 
 EXTRA_DIST = libcamelexchange.urls
diff --git a/configure.ac b/configure.ac
index 1b9e4a0..7e3ec2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,11 +93,13 @@ case "$host" in
 	os_win32=yes
 	NO_UNDEFINED='-no-undefined'
 	SOCKET_LIBS='-lws2_32'
+	DNS_LIBS='-ldnsapi'
 	;;
 *)
 	os_win32=no
 	NO_UNDEFINED='-no-undefined'
 	SOCKET_LIBS=''
+	DNS_LIBS=''
 	;;
 esac
 
@@ -105,6 +107,7 @@ AC_MSG_RESULT([$os_win32])
 AM_CONDITIONAL(OS_WIN32, [test "x$os_win32" = "xyes"])
 AC_SUBST(NO_UNDEFINED)
 AC_SUBST(SOCKET_LIBS)
+AC_SUBST(DNS_LIBS)
 
 dnl ******************
 dnl Initialize libtool
diff --git a/eplugin/Makefile.am b/eplugin/Makefile.am
index 94005b2..4f710d7 100644
--- a/eplugin/Makefile.am
+++ b/eplugin/Makefile.am
@@ -59,11 +59,13 @@ liborg_gnome_exchange_operations_la_SOURCES = \
 	exchange-send-options.h
 
 liborg_gnome_exchange_operations_la_LIBADD = \
+	$(top_builddir)/server/storage/libexchange-storage.la \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
 	$(EVOLUTION_PLUGIN_LIBS) \
 	$(EVOLUTION_SHELL_LIBS) \
 	$(EVOLUTION_MAIL_LIBS) \
-	$(top_builddir)/server/storage/libexchange-storage.la
+	$(PTHREAD_LIB) \
+	$(DNS_LIBS)
 
 liborg_gnome_exchange_operations_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/server/lib/e2k-global-catalog.c b/server/lib/e2k-global-catalog.c
index 7bea46b..73cb349 100644
--- a/server/lib/e2k-global-catalog.c
+++ b/server/lib/e2k-global-catalog.c
@@ -1182,9 +1182,11 @@ do_delegate_op (E2kGlobalCatalog *gc, E2kOperation *op, gint deleg_op,
 		E2K_GC_DEBUG_MSG(("GC: bad delegate\n\n"));
 		return E2K_GLOBAL_CATALOG_BAD_DATA;
 
+#ifndef G_OS_WIN32
 	case LDAP_TYPE_OR_VALUE_EXISTS:
 		E2K_GC_DEBUG_MSG(("GC: delegate already exists\n\n"));
 		return E2K_GLOBAL_CATALOG_EXISTS;
+#endif
 
 	case LDAP_USER_CANCELLED:
 		E2K_GC_DEBUG_MSG(("GC: cancelled\n\n"));
diff --git a/server/storage/Makefile.am b/server/storage/Makefile.am
index d10cdad..1090bc1 100644
--- a/server/storage/Makefile.am
+++ b/server/storage/Makefile.am
@@ -1,8 +1,3 @@
-if OS_WIN32
-WIN32_BOOTSTRAP_LIBS = \
-	$(top_builddir)/win32/libedataserverui-1.2.la
-endif
-
 noinst_LTLIBRARIES = \
 	libexchange-storage.la
 
@@ -60,7 +55,6 @@ libexchange_storage_la_SOURCES = \
 	exchange-types.h
 
 libexchange_storage_la_LIBADD = \
-	$(WIN32_BOOTSTRAP_LIBS) \
 	$(top_builddir)/server/lib/libexchange.la \
 	$(top_builddir)/server/xntlm/libxntlm.la \
 	$(GNOME_PLATFORM_LIBS) \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d8b7c5f..9d9e6d7 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -67,14 +67,20 @@ exchange_connector_setup_LDADD = \
 	$(GNOME_PLATFORM_LIBS) \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
 	$(EVOLUTION_PLUGIN_LIBS) \
-	$(LDAP_LIBS)
+	$(PTHREAD_LIB) \
+	$(LDAP_LIBS)\
+	$(DNS_LIBS)
+
+if OS_WIN32
+exchange_connector_setup_LDFLAGS = -mwindows
+endif
 
-install-exec-local: exchange-connector-setup
+install-exec-local: exchange-connector-setup EXEEXT@
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) exchange-connector-setup $(DESTDIR)$(bindir)/exchange-connector-setup-$(BASE_VERSION)
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) exchange-connector-setup EXEEXT@ $(DESTDIR)$(bindir)/exchange-connector-setup-$(BASE_VERSION)@EXEEXT@
 
 uninstall-local:
-	rm -rf $(DESTDIR)$(bindir)/exchange-connector-setup-$(BASE_VERSION)
+	rm -rf $(DESTDIR)$(bindir)/exchange-connector-setup-$(BASE_VERSION)@EXEEXT@
 
 imagesdir = $(CONNECTOR_DATADIR)/images
 images_DATA = \
diff --git a/tools/exchange-autoconfig-wizard.c b/tools/exchange-autoconfig-wizard.c
index b0aecf6..2e16d15 100644
--- a/tools/exchange-autoconfig-wizard.c
+++ b/tools/exchange-autoconfig-wizard.c
@@ -39,8 +39,9 @@
 
 #ifdef G_OS_WIN32
 
-#undef CONNECTOR_IMAGESDIR
-#define CONNECTOR_IMAGESDIR _exchange_storage_imagesdir
+#ifdef G_OS_WIN32
+#include <libedataserver/e-data-server-util.h>
+#endif
 
 #endif
 
diff --git a/tools/ximian-connector-setup.c b/tools/ximian-connector-setup.c
index fef9415..c2be9ff 100644
--- a/tools/ximian-connector-setup.c
+++ b/tools/ximian-connector-setup.c
@@ -27,8 +27,8 @@
 #include "exchange-autoconfig-wizard.h"
 
 #ifdef G_OS_WIN32
+#include <libedataserver/e-data-server-util.h>
 const gchar *_exchange_storage_datadir;
-const gchar *_exchange_storage_gladedir;
 const gchar *_exchange_storage_imagesdir;
 #endif
 
@@ -45,7 +45,6 @@ main (gint argc, gchar **argv)
 		 * same run-time prefix as evolution-data-server.
 		 */
 		_exchange_storage_datadir = e_util_replace_prefix (PREFIX, e_util_get_prefix (), DATADIR);
-		_exchange_storage_gladedir = e_util_replace_prefix (PREFIX, e_util_get_prefix (), CONNECTOR_GLADEDIR);
 		_exchange_storage_imagesdir = e_util_replace_prefix (PREFIX, e_util_get_prefix (), CONNECTOR_IMAGESDIR);
 
 		localedir = e_util_replace_prefix (CONNECTOR_LOCALEDIR, e_util_get_cp_prefix (), CONNECTOR_LOCALEDIR);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]