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

[Stephan Bergmann]

 configure.ac |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit e3c2c245f83cfe9359d67122af307abb9db25b13
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon May 29 16:16:48 2017 +0200

    Always looking for {msvcp,vcruntime}140.dll now
    
    ...since b862cbdd345ec57c2595629ded6a3969e1e65d56 "Support MSVC 15.0".
    
    Change-Id: I6e300966ebc006f6ebc6a6ec3af0e0c9e770df1d
    Reviewed-on: https://gerrit.libreoffice.org/38150
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configure.ac b/configure.ac
index f199e8ec99e3..1216160fa30f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5288,11 +5288,7 @@ find_msvc_x64_dlls()
             msvcdllpath="$VC_PRODUCT_DIR/redist/MSVC/$vcbuildnumber/x64/Microsoft.VC${VCVER}.CRT"
         fi
     fi
-    if test "$VCVER" = 150; then
-       msvcdlls="msvcp140.dll vcruntime140.dll"
-    else
-       msvcdlls="msvcp${VCVER}.dll vcruntime${VCVER}.dll"
-    fi
+    msvcdlls="msvcp140.dll vcruntime140.dll"
     for dll in $msvcdlls; do
         if ! test -f "$msvcdllpath/$dll"; then
             AC_MSG_ERROR([can not find $dll in $msvcdllpath])