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

[Tor Lillqvist]

 configure.ac |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 967d0089a16ad236a0fb9f5bba7fafd2327745a9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Mar 9 09:12:24 2017 +0200

    Remove misleading comment, and sort alternatives in case statement
    
    As the patterns in the cases don't overlap, it makes no differentce in
    what order they are. So keep them sorted for clarity.
    
    Change-Id: I60f8304d66f6925028f86a2956f1136547dc51eb

diff --git a/configure.ac b/configure.ac
index bab96b0..bb889a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5237,7 +5237,6 @@ find_winsdk_version()
 
     unset winsdktest winsdklibsubdir
 
-    # Why we look for them in this particular order I don't know.
     case "$1" in
     7.*)
         reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v${1}/InstallationFolder"
@@ -5247,19 +5246,19 @@ find_winsdk_version()
             return
         fi
         ;;
-    8.1|8.1A)
-        reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows Kits/Installed Roots/KitsRoot81"
+    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
-            winsdklibsubdir=winv6.3
+            winsdklibsubdir=win8
             return
         fi
         ;;
-    8.0|8.0A)
-        reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows Kits/Installed Roots/KitsRoot"
+    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
-            winsdklibsubdir=win8
+            winsdklibsubdir=winv6.3
             return
         fi
         ;;