[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac

[Michael Meeks]

 configure.ac |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 150d258234be57619c860c51a74410caf650cb00
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Thu Jun 20 17:33:09 2013 +0100

    fdo#65975 - fix failed compilation on windows 32bit.
    
    Change-Id: I69033856962e8d716f059dca9a9d68cd40ec429c
    Reviewed-on: https://gerrit.libreoffice.org/4401
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/configure.ac b/configure.ac
index f5a72d6..5e01923 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4874,7 +4874,14 @@ find_msms()
 find_msvc_x64_dlls()
 {
     if test "$VCVER" != "90"; then
-        msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT"
+
+        if test "$CPUNAME" = "INTEL"; then
+           vsarch=x86
+        else
+           vsarch=x64
+        fi
+
+        msvcdllpath="$VC_PRODUCT_DIR/redist/$vsarch/Microsoft.VC${VCVER}.CRT"
         MSVC_DEBUG_DLL_PATH="$VC_PRODUCT_DIR/redist/Debug_NonRedist/$vsarch/Microsoft.VC${VCVER}.DebugCRT"
         msvcdlls="msvcp${VCVER}.dll msvcr${VCVER}.dll"
         MSVC_DEBUG_DLLS="msvcp${VCVER}d.dll msvcr${VCVER}d.dll"