config_host.mk.in | 2 ++
configure.ac | 10 +++++++++-
external/Module_external.mk | 1 +
external/Package_msvc80_dlls.mk | 16 ++++++++++++++++
4 files changed, 28 insertions(+), 1 deletion(-)
New commits:
commit 8ecb2c52a67168a4a00b649e7f70731b21a7a91a
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Mon Mar 4 17:29:41 2013 +0100
If Mozab is built, look for VS2005 dlls
Change-Id: Id5585ff27af8e743adbecbdad3587db9224a394b
diff --git a/config_host.mk.in b/config_host.mk.in
index 11d95cd..172ab31 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -398,6 +398,8 @@ export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@
export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@
export MSVC_DLLS=@MSVC_DLLS@
export MSVC_DLL_PATH=@MSVC_DLL_PATH@
+export MSVC80_DLLS=@MSVC80_DLLS@
+export MSVC80_DLL_PATH=@MSVC80_DLL_PATH@
export MYSQLC_MAJOR=@MYSQLC_MAJOR@
export MYSQLC_MICRO=@MYSQLC_MICRO@
export MYSQLC_MINOR=@MYSQLC_MINOR@
diff --git a/configure.ac b/configure.ac
index abe1ee8..066fa80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8102,16 +8102,24 @@ 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
- AC_MSG_RESULT([yes])
WITH_MOZAB4WIN=YES
AC_MSG_RESULT([yes, internal (old windows mozab driver)])
BUILD_TYPE="$BUILD_TYPE MOZ"
+ MSVC80_DLLS="msvcp80.dll msvcr80.dll Microsoft.VC80.CRT.manifest"
+ MSVC80_DLL_PATH=`cygpath -u "$TARFILE_LOCATION"`
+ for dll in $MSVC80_DLLS; do
+ if ! test -f "$MSVC80_DLL_PATH/$dll"; then
+ AC_MSG_ERROR([can not find $dll in $MSVC80_DLL_PATH needed for
the pre-built Mozilla libraries])
+ fi
+ done
else
AC_MSG_RESULT([no])
WITH_MOZAB4WIN=NO
fi
fi
AC_SUBST(WITH_MOZAB4WIN)
+AC_SUBST(MSVC80_DLLS)
+AC_SUBST(MSVC80_DLL_PATH)
dnl ===================================================================
dnl Check for system NSS
diff --git a/external/Module_external.mk b/external/Module_external.mk
index c5a312a..8bb0a40 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Module_add_targets,external,\
Package_dbghelp \
Package_msms \
Package_msvc_dlls \
+ Package_msvc80_dlls \
))
endif
diff --git a/external/Package_msvc80_dlls.mk b/external/Package_msvc80_dlls.mk
new file mode 100644
index 0000000..5e51080
--- /dev/null
+++ b/external/Package_msvc80_dlls.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,msvc80_dlls,$(MSVC80_DLL_PATH)))
+
+$(eval $(call gb_Package_add_files,msvc80_dlls,bin,\
+ $(MSVC80_DLLS) \
+))
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
