configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 350555b5be0f4ac906ab3c330ec7312298831d22
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Mon Jun 9 14:30:11 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Mon Jun 9 16:18:02 2025 +0200
fixup "cleanup msvcdll stuff"
there were unstaged changes that should have been part of
d39842d01b63143a4832be0e01a8b3c216afa9e7
Change-Id: I80faa7e1a0c0572d8b96adbebe846a980e929fc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186296
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
diff --git a/configure.ac b/configure.ac
index 72eb72275cb5..5f96543de486 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7161,7 +7161,7 @@ find_msms()
local version="$1"
AC_MSG_CHECKING([for MSVC $version merge modules directory])
- local my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/${version}/MergeModules"
+ local my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/v${version}/MergeModules"
local my_msm_file="$my_msm_dir/Microsoft_VC${version}_CRT_x86.msm"
echo "$as_me:$LINENO: looking for ${my_msm_file}" >&5
if test -e "${my_msm_file}"; then
@@ -8988,7 +8988,7 @@ if test $_os = "WINNT"; then
for i in $PKGFORMAT; do
if test "$i" = msi; then
dnl strip initial v from the version label found by find_msvc
- with_vcredis=${VCTOOLSET:1}
+ with_redist=${VCTOOLSET:1}
find_msms "$with_redist"
if test -n "$msmdir"; then
MSM_PATH=`win_short_path_for_make "$msmdir"`/
