Followup to bug 699385: remove a bit from js/src/configure.in I forgot to tackle in the original patch.
authorSiddharth Agarwal <sid.bugzilla@gmail.com>
Fri, 27 Jan 2012 00:04:09 +0530
changeset 86722 0eef9179ab0df1b281884a90d47ed3550bb9f12c
parent 86721 5eb7ad98588a3f78d76402227f87fbb9d77c1a00
child 86724 a82c9700c6730311cd4f5594d43a1f4aac0f913f
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs699385
milestone12.0a1
Followup to bug 699385: remove a bit from js/src/configure.in I forgot to tackle in the original patch.
js/src/configure.in
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -798,25 +798,18 @@ case "$target" in
 
 WINSDK_MAXVER
 EOF
                             ac_cv_winsdk_maxver=`$CPP conftest.h 2>/dev/null | tail -n1`
                             rm -f conftest.h
                            ])
             MOZ_WINSDK_MAXVER=${ac_cv_winsdk_maxver}
         else
-            # The Vista SDK is the only one to have sdkddkver.h but not
-            # WinSDKVer.h
-            MOZ_CHECK_HEADERS([sdkddkver.h])
-            if test "$ac_cv_header_sdkddkver_h" = "yes"; then
-                MOZ_WINSDK_MAXVER=0x06000000
-            else
-                # Assume the Server 2003 Platform SDK
-                MOZ_WINSDK_MAXVER=0x05020000
-            fi
+            # Any SDK which doesn't have WinSDKVer.h is too old.
+            AC_MSG_ERROR([Your SDK does not have WinSDKVer.h. It is probably too old. Please upgrade to a newer SDK or try running the Windows SDK Configuration Tool and selecting a newer SDK. See https://developer.mozilla.org/En/Windows_SDK_versions for more details on fixing this.])
         fi
 
         unset _MSVC_VER_FILTER
 
         AC_CACHE_CHECK(for std::_Throw, ac_cv_have_std__Throw,
             [
                 AC_LANG_SAVE
                 AC_LANG_CPLUSPLUS