From cdd699eacf853192686095399433384109e565a2 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 21 Jul 2015 23:07:44 +0200
Subject: configure: try not to break with MSVC 2013 Express

The devenv.exe /Upgrade is apparently not supported by Express, but that
is currently only needed for the 2015 version, so try to keep 2013
Express working.

Change-Id: I40bb8a5c9583381e89ede2e014e6e095016bbe11
Reviewed-on: https://gerrit.libreoffice.org/17275
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
---
 configure.ac | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure.ac b/configure.ac
index e7f68723f25e..2d36f0c388c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3568,6 +3568,10 @@ if test "$_os" = "WINNT"; then
 
         # Find the version of devenv.exe
         DEVENV="$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe"
+        if test ! -e "$DEVENV" -a "$vcnum" = "120"; then
+            # for Visual Studio 2013 Express, fall back
+            DEVENV="$VC_PRODUCT_DIR/../Common7/IDE/WDExpress.exe"
+        fi
         if test ! -e "$DEVENV"; then
             AC_MSG_ERROR([No devenv.exe found, Visual Studio installation broken?])
         fi
-- 
cgit