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

[Michael Stahl]

 configure.ac |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 242ed97d9a74a08363e1306452bba20f06d673e4
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 3 23:46:15 2015 +0100

    configure: update supported --with-windows-sdk values
    
    Change-Id: I3589214b540232d84ad86c67991065f7d376c94b

diff --git a/configure.ac b/configure.ac
index 2b664ac..6c3dbfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2027,14 +2027,14 @@ AC_ARG_WITH(visual-studio,
 ,)
 
 AC_ARG_WITH(windows-sdk,
-    AS_HELP_STRING([--with-windows-sdk=<6.0(A)/7.0(A)/7.1(A)/8.0(A)>],
+    AS_HELP_STRING([--with-windows-sdk=<7.1(A)/8.0(A)/8.1(A)>],
         [Specify which Windows SDK, or "Windows Kit", version to use
          in case the one that came with the selected Visual Studio
          is not what you want for some reason. Note that not all compiler/SDK
          combinations are supported. The intent is that this option should not
          be needed.])
     [
-                          Usage:     --with-windows-sdk=6.0(A)/7.0(A)/7.1(A)/8.0(A)>
+                          Usage:     --with-windows-sdk=7.1(A)/8.0(A)/8.1(A)>
     ],
 ,)
 
@@ -5088,7 +5088,7 @@ find_winsdk_version()
 
     # Why we look for them in this particular order I don't know. But OTOH I
     case "$1" in
-    6.0*|7.*)
+    7.*)
         reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v${1}/InstallationFolder"
         if test -n "$regvalue"; then
             winsdktest=$regvalue
commit c503d3780fd095cc94103bf0f89b662c446b3b2b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 3 23:33:48 2015 +0100

    configure: properly check for Windows SDK 8.1A
    
    Due to the wildcard checking for it will actually attempt to check for the
    SDK 8.0, which fails with Visual Studio 2013 because its SDK 8.0 apparently
    lacks a midl.exe, so configure fails.
    
    Change-Id: Ib0e61a3a999d6a2ebe16645225fc9838dab3bdb1

diff --git a/configure.ac b/configure.ac
index e7e7f47..2b664ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5096,7 +5096,7 @@ find_winsdk_version()
             return
         fi
         ;;
-    8.1)
+    8.1|8.1A)
         reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows Kits/Installed Roots/KitsRoot81"
         if test -n "$regvalue"; then
             winsdktest=$regvalue
@@ -5104,7 +5104,7 @@ find_winsdk_version()
             return
         fi
         ;;
-    8.*)
+    8.0|8.0A)
         reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows Kits/Installed Roots/KitsRoot"
         if test -n "$regvalue"; then
             winsdktest=$regvalue