diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-06-29 16:50:53 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-06-29 22:22:32 +0200 |
| commit | 14e625e0a0618cce5cefefb1527cd2dfdb61224e (patch) | |
| tree | 5ef760adf2e5ab3e3f11ef3847ceb39765b93c83 /configure.ac | |
| parent | 49d6768483fbae8789d97512e78a00b860fbad60 (diff) | |
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>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 1ea8e0546a15..20536adf2464 100644 --- a/configure.ac +++ b/configure.ac @@ -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"` |