diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-01-19 20:47:03 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-04-23 16:51:10 +0200 |
| commit | 9a3b9658c7989bad027b81b835a63fcce2360ee8 (patch) | |
| tree | d7effa13dbb75692a1d97cda2a04250f8800efdb /configure.ac | |
| parent | a746fb861638918ebfa7aa2be4781e6948bc3587 (diff) | |
scp2: also try VC141_CRT_*.msm
Apparently the MSMs have been renamed in Visual Studio 2017.3 but only
configure was adapted, not scp2.
Not sure if these MSMs are still relevant given the new
gid_File_Vcredist_Exe thing.
Change-Id: I4fe27c8298b3a2024acc62d12ce8ea67e2eca80d
Reviewed-on: https://gerrit.libreoffice.org/53319
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a0dcd888b933..db52ee9456cc 100644 --- a/configure.ac +++ b/configure.ac @@ -6499,7 +6499,12 @@ if test $_os = "WINNT"; then MSVC_DLL_PATH="$msvcdllpath" MSVC_DLLS="$msvcdlls" MSM_PATH="$msmdir" - SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST" + # MSVC 15.3 changed it to VC141 + if echo "$MSVC_DLL_PATH" | grep -q "VC141.CRT$"; then + SCPDEFS="$SCPDEFS -DWITH_VC141_REDIST" + else + SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST" + fi if test "$VCREDIST_DIR" = "no"; then dnl explicitly disabled VCREDIST_DIR="" |