From 9e9c7d8b541448fd6022837633d50baa5bbfab69 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Thu, 9 Mar 2017 15:29:14 +0100
Subject: configure: find the MSMs where MSVC 2017 Release hides them

Change-Id: Id98d73eef46d63686745bf6cd3482b18c7223c3a
---
 configure.ac | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index d1b813fbafe5..dc837c55c487 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5336,6 +5336,12 @@ find_msms()
         my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/$vcbuildnumber/MergeModules/"
         if test -e "$my_msm_dir/$my_msm_file"; then
             msmdir=$my_msm_dir
+        else
+            # got everything in 14.10.15017 except the MSMS in 25008... huh?
+            my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/14.10.25008/MergeModules/"
+            if test -e "$my_msm_dir/$my_msm_file"; then
+                msmdir=$my_msm_dir
+            fi
         fi
     fi
 
@@ -5347,6 +5353,7 @@ find_msms()
             AC_MSG_ERROR([not found])
         else
             AC_MSG_WARN([not found])
+            add_warning "MSM $my_msm_file not found"
         fi
     fi
 }
-- 
cgit