[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - configure.ac

[David Ostrovsky]

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

New commits:
commit adc69d7fe391154fcebf9c97b857c6ddccec4539
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Wed Feb 17 19:49:12 2016 +0100

    Consider MSVC 14.0 per default, when no MSVC 12.0 installed
    
    Change-Id: I7de8df7d8b7da2c16e27f22529162574bc0f747d
    Reviewed-on: https://gerrit.libreoffice.org/22436
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    Tested-by: David Ostrovsky <david at ostrovsky.org>
    (cherry picked from commit 649f74e21b6dc7117b542f490272897ac1d00566)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/22484

diff --git a/configure.ac b/configure.ac
index fc1f179..5099873 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3343,8 +3343,8 @@ vs_versions_to_check()
         map_vs_year_to_version "$1"
         vsversions=$vsversion
     else
-        # By default we prefer 2013
-        vsversions=12.0
+        # By default we prefer 2013/2015, in this order
+        vsversions="12.0 14.0"
     fi
 }