[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist]

 configure.ac |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 9c0a5c211079be9436d58c6ca596df30ed93d8bb
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Mar 8 15:54:08 2017 +0200

    Adapt path to the CRT redist for VS2017 build 14.10.25017
    
    Seems that they added an "onecore" directory level before the "x64".
    At least in the Community Edition.

diff --git a/configure.ac b/configure.ac
index 57506a0..49b0607 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5358,7 +5358,11 @@ find_msvc_x64_dlls()
 {
     msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT"
     if test "$VCVER" = 150; then
-        msvcdllpath="$VC_PRODUCT_DIR/redist/MSVC/$vcbuildnumber/x64/Microsoft.VC${VCVER}.CRT"
+        if test $vcbuildnumber = 14.10.25017; then
+            msvcdllpath="$VC_PRODUCT_DIR/redist/MSVC/$vcbuildnumber/onecore/x64/Microsoft.VC${VCVER}.CRT"
+        else
+            msvcdllpath="$VC_PRODUCT_DIR/redist/MSVC/$vcbuildnumber/x64/Microsoft.VC${VCVER}.CRT"
+        fi
     fi
     # http://blogs.msdn.com/b/vcblog/archive/2014/06/03/visual-studio-14-ctp.aspx
     # Refactored C Runtime (CRT): This CTP contains the first preview of the substantially refactored CRT.