[Libreoffice-commits] core.git: configure.ac

[Stephan Bergmann (via logerrit)]

 configure.ac |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 2118504c7b00d963057ae8b5d21ff56f5ce90e22
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Feb 28 09:41:37 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Feb 28 11:02:05 2020 +0100

    Remove redundant MSVSVER
    
    Same as vcyear since ba6c014d9c3e2267cfa08e753ea7ba651a03f2fe "Simplify Visual
    Studio and Windows SDK related configurability"
    
    Change-Id: I77f27b43d2bbac73ff739ac1f9580076e8b46ff2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89664
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 292bade76fbe..e0107cc0e35a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3601,7 +3601,6 @@ if test "$_os" = "WINNT"; then
         COMPATH=`win_short_path_for_make "$formatted_path"`
 
         VCVER=$vcnum
-        MSVSVER=$vcyear
 
         # The WINDOWS_SDK_ACCEPTABLE_VERSIONS is mostly an educated guess...  Assuming newer ones
         # are always "better", we list them in reverse chronological order.
@@ -3619,7 +3618,7 @@ if test "$_os" = "WINNT"; then
                 WINDOWS_SDK_ACCEPTABLE_VERSIONS=$with_windows_sdk
                 ;;
             *)
-                AC_MSG_ERROR([Windows SDK $with_windows_sdk is not known to work with VS $MSVSVER])
+                AC_MSG_ERROR([Windows SDK $with_windows_sdk is not known to work with VS $vcyear])
                 ;;
             esac
         fi