summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2020-06-29 11:33:46 +0300
committerTor Lillqvist <tml@collabora.com>2020-06-29 14:30:11 +0200
commita73a3fcee62a10dd7063e6e98627c37dd0570fb7 (patch)
tree1f32c416dbf6cea8c1022bc95ae902ac999c7d55
parent17f131fcb3f534792a3b2ec6048d03fb54b55eb1 (diff)
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@collabora.com>
-rw-r--r--configure.ac4
1 files changed, 4 insertions, 0 deletions
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