From 14fc882e5c01e110d0fea7fb08489a0f0e98dbe6 Mon Sep 17 00:00:00 2001
From: Andras Timar <andras.timar@collabora.com>
Date: Mon, 14 Sep 2015 00:01:39 -0700
Subject: [PATCH] add MSVC 14.0 runtime merge modules

Change-Id: Ib32a4f2484466802ac6c9152e8dd41fc8c67aa46
Reviewed-on: https://gerrit.libreoffice.org/18560
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
---
 configure.ac                  |  2 +-
 scp2/source/ooo/vc_redist.scp | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ebf80f42b335..9e0be4189f82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5258,7 +5258,7 @@ find_msms()
     my_msm_file=Microsoft_VC${VCVER}_CRT_x86.msm
     AC_MSG_CHECKING([for $my_msm_file])
     msmdir=
-    for ver in 12.0; do
+    for ver in 12.0 14.0; do
         reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir
         if test -n "$regvalue"; then
             if test -e "$regvalue/$my_msm_file"; then
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 5b56739af581..23214f0e2eaa 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -59,3 +59,22 @@ End
 
 #endif
 
+#if defined(WITH_VC140_REDIST)
+
+#if defined WINDOWS_X64
+MergeModule gid_MergeModule_Microsoft_VC140_CRT_x64
+#else
+MergeModule gid_MergeModule_Microsoft_VC140_CRT_x86
+#endif
+    Feature = gm_Root;
+#if defined WINDOWS_X64
+    Name = "Microsoft_VC140_CRT_x64.msm";
+#else
+    Name = "Microsoft_VC140_CRT_x86.msm";
+#endif
+    RootDir = "TARGETDIR";
+    ComponentCondition = "VC_REDIST=1";
+End
+
+#endif
+