diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-02-02 11:30:57 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-04 13:19:01 +0000 |
| commit | e6a58b5e69b83e01b5291b1d8629927e05447797 (patch) | |
| tree | 4e888bc1abd383c0cd86fe648c3f985de7678f4b | |
| parent | 2bb5d4c840f95e5a3dd81122af479a9625db6dfc (diff) | |
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 <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | connectivity/Module_connectivity.mk | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d83d4a8f52fc..0ffc61c1db0f 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 46b030d6cd67..97310d128914 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,\ |