configure.ac | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 42da199753515584e615cdcdd8601d2ffc27245b
Author: Noel Grandin <n...@peralex.com>
AuthorDate: Thu Oct 14 10:58:25 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Oct 14 13:35:48 2021 +0200
more VS2022 integration
so it finds the v143 DLLs
Change-Id: I2bc8b37b681e68b04868cdfe704b2f085b4ea277
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123579
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/configure.ac b/configure.ac
index 62d74e99db55..88962625644f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6471,7 +6471,7 @@ find_msvc_x64_dlls()
msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT"
case "$VCVER" in
16.0 | 17.0)
- for crtver in 141 142; do
+ for crtver in 141 142 143; do
for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do
echo "$as_me:$LINENO: testing
$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT" >&5
if test -d
"$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT"; then
@@ -8210,7 +8210,9 @@ if test $_os = "WINNT"; then
MSVC_DLLS="$msvcdlls"
test -n "$msmdir" && MSM_PATH=`win_short_path_for_make "$msmdir"`
# MSVC 15.3 changed it to VC141
- if echo "$msvcdllpath" | grep -q "VC142.CRT$"; then
+ if echo "$msvcdllpath" | grep -q "VC143.CRT$"; then
+ SCPDEFS="$SCPDEFS -DWITH_VC143_REDIST"
+ elif echo "$msvcdllpath" | grep -q "VC142.CRT$"; then
SCPDEFS="$SCPDEFS -DWITH_VC142_REDIST"
elif echo "$msvcdllpath" | grep -q "VC141.CRT$"; then
SCPDEFS="$SCPDEFS -DWITH_VC141_REDIST"
