[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit a73a3fcee62a10dd7063e6e98627c37dd0570fb7
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Jun 29 11:33:46 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Jun 29 14:30:11 2020 +0200

    We don't need merge modules if we aren't building an MSI
    
    Change-Id: Ifc14280049bdf850f43fc20554bc703961d50f86
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97392
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index 00041399ebaf..1ea8e0546a15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5729,6 +5729,10 @@ 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