Fix check whether "msi" is among --with-package-format=... tokens
Change-Id: I8979a88743926141af3b3c6f9b579b4ee34f494b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97426 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
+6
-5
@@ -5729,10 +5729,6 @@ find_winsdk()
|
||||
|
||||
find_msms()
|
||||
{
|
||||
if test "$with_package_format" != msi; then
|
||||
return
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([for MSVC merge modules directory])
|
||||
my_msm_files=Microsoft_VC${VCVER}_CRT_x86.msm
|
||||
case "$VCVER" in
|
||||
@@ -7433,7 +7429,12 @@ AC_ARG_WITH(ucrt-dir,
|
||||
UCRT_REDISTDIR="$with_ucrt_dir"
|
||||
if test $_os = "WINNT"; then
|
||||
find_msvc_x64_dlls
|
||||
find_msms
|
||||
for i in $PKGFORMAT; do
|
||||
if test "$i" = msi; then
|
||||
find_msms
|
||||
break
|
||||
fi
|
||||
done
|
||||
MSVC_DLL_PATH=`win_short_path_for_make "$msvcdllpath"`
|
||||
MSVC_DLLS="$msvcdlls"
|
||||
MSM_PATH=`win_short_path_for_make "$msmdir"`
|
||||
|
||||
Reference in New Issue
Block a user