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

[Michael Stahl]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9631d68140e344379fab8606e8a31a84de9074e6
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jun 27 14:11:35 2013 +0200

    Revert "fdo#65975 - fix failed compilation on windows 32bit."
    
    This reverts commit 150d258234be57619c860c51a74410caf650cb00.
    
    This breaks the 64bit shell extensions by bundling 32bit MSVC runtimes.
    
    Change-Id: I9f958962315f0fe9e8a2f6a4bb580022b8122089
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/configure.ac b/configure.ac
index b3f7876..50368f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4881,7 +4881,7 @@ find_msvc_x64_dlls()
            vsarch=x64
         fi
 
-        msvcdllpath="$VC_PRODUCT_DIR/redist/$vsarch/Microsoft.VC${VCVER}.CRT"
+        msvcdllpath="$VC_PRODUCT_DIR/redist/x64/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"