summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-03-09 09:12:24 +0200
committerTor Lillqvist <tml@collabora.com>2017-03-09 09:13:26 +0200
commit967d0089a16ad236a0fb9f5bba7fafd2327745a9 (patch)
tree1d14989f8bdca3dc52470dda6f28977cffdde9ae
parent128b7500231dc8c71496eab00c6dee6960db6675 (diff)
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
-rw-r--r--configure.ac13
1 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index bab96b0f46a1..bb889a287a60 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
;;