configure.ac | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
New commits:
commit a5794f08635ef5f526e25c45542c9ac009a07757
Author: Andras Timar <ati...@suse.com>
Date: Wed Jan 23 16:02:25 2013 +0100
sort out msm finding/copying issues
Change-Id: Id54b9a480b345b52f86c53f6a0a939c18807ec05
diff --git a/configure.ac b/configure.ac
index c005756..7001d12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4959,11 +4959,7 @@ find_msms()
fi
msms="Microsoft_VC${VCVER}_CRT_x86.msm"
- if test -e $msmdir/Microsoft_VC${VCVER}_CRT_x64.msm; then
- msms="$msms Microsoft_VC${VCVER}_CRT_x64.msm"
- else
- AC_MSG_WARN([Failed to copy x64 merge modules, installation will lack
the 64-bit Explorer extension])
- fi
+
if test "$VCVER" = "90"; then
if test -e $msmdir/policy_9_0_Microsoft_VC90_CRT_x86.msm; then
msms="$msms policy_9_0_Microsoft_VC90_CRT_x86.msm"
@@ -4971,6 +4967,21 @@ find_msms()
AC_MSG_ERROR([Merge modules not found])
fi
fi
+
+ if test "$BUILD_X64" = TRUE; then
+ if test -e $msmdir/Microsoft_VC${VCVER}_CRT_x86_x64.msm; then
+ msms="$msms Microsoft_VC${VCVER}_CRT_x86_x64.msm"
+ else
+ AC_MSG_ERROR([Failed to copy x64 merge modules])
+ fi
+ if test "$VCVER" = "90"; then
+ if test -e $msmdir/policy_9_0_Microsoft_VC90_CRT_x86_x64.msm; then
+ msms="$msms policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"
+ else
+ AC_MSG_ERROR([Merge modules not found])
+ fi
+ fi
+ fi
}
find_msvc_dlls()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
