configure.ac | 3 +++
connectivity/Module_connectivity.mk | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit e6a58b5e69b83e01b5291b1d8629927e05447797
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Mon Feb 2 11:30:57 2015 +0100
Activate mork driver on windows 64 bit build
On Windows 32 bit ancient seamonkey library is linked against
libreoffice. In 64 bit we cannot used this library and we cannot
recompile it because it was removed. Instead use mork driver.
This would still meant functionality loss because Outlook and Outlook
Express address book wouldn't be supported any more.
Change-Id: I77fbb59aaeb6c7f3b6754e7ffb9172064155e8f3
Reviewed-on: https://gerrit.libreoffice.org/14275
Tested-by: Michael Stahl <mst...@redhat.com>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/configure.ac b/configure.ac
index d83d4a8..0ffc61c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8639,6 +8639,9 @@ dnl
===================================================================
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([whether to enable build of Mozilla addressbook
connectivity driver for Windows])
if test "$enable_win_mozab_driver" = "yes" -a "$WITH_MINGW" != "YES" ; then
+ if test "$BITNESS_OVERRIDE" = 64; then
+ AC_MSG_ERROR([--with-win-mozab-driver and --enable-64-bit options
are mutually exclusive])
+ fi
WITH_MOZAB4WIN=TRUE
AC_MSG_RESULT([yes, internal (old windows mozab driver)])
BUILD_TYPE="$BUILD_TYPE MOZ"
diff --git a/connectivity/Module_connectivity.mk
b/connectivity/Module_connectivity.mk
index 46b030d..97310d1 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -102,7 +102,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
))
endif
-ifeq ($(OS),WNT)
+ifeq ($(OS)-$(CPU),WNT-INTEL)
ifneq ($(WITH_MOZAB4WIN),)
$(eval $(call gb_Module_add_targets,connectivity,\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
