hack around sdk installer breakage

21040f22 · Caolán McNamara · 0b584c94 · 21040f22
Kaydet (Commit) 21040f22 authored Şub 10, 2012 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

configure.in configure.in +10 -0

No files found.
--- a/configure.in
+++ b/configure.in
@@ -7711,6 +7711,16 @@ if test "$_os" = "WINNT"; then
            if test -n "$WINDOWS_SDK_HOME"; then
                WINDOWS_SDK_HOME=`cygpath -d "$WINDOWS_SDK_HOME"`
                WINDOWS_SDK_HOME=`cygpath -u "$WINDOWS_SDK_HOME"`
+
+                #If this sdk is incomplete, lets see if the one
+                #recommended to be installed is available
+                if test ! -x "$WINDOWS_SDK_HOME/bin/msiinfo.exe"; then
+                    WINDOWS_SDK7_HOME=`cat "/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v7.1/InstallationFolder" 2> /dev/null | tr '\000' '\n' | head -n 1`
+                    if test -n "$WINDOWS_SDK7_HOME"; then
+                        WINDOWS_SDK_HOME=`cygpath -d "$WINDOWS_SDK7_HOME"`
+                        WINDOWS_SDK_HOME=`cygpath -u "$WINDOWS_SDK_HOME"`
+                    fi
+                fi
            fi
        else
            WINDOWS_SDK_HOME=`cygpath -u "$with_windows_sdk_home"`