Bug 716381. (Av1) Error out if too old 'February 2010 DirectX SDK' is found. r=mbanner.
authorSerge Gautherie <sgautherie.bz@free.fr>
Thu, 12 Jan 2012 00:23:06 +0100
changeset 10408 49f1b07d5c78618a2975986d8ca192c169e00e7f
parent 10407 c01205ffb4f85dff0a3097746e5eebb24e7fa273
child 10409 7ad0f0a36639cadc9c9e36ad5bf9e7575f92a7c1
push idunknown
push userunknown
push dateunknown
reviewersmbanner
bugs716381
Bug 716381. (Av1) Error out if too old 'February 2010 DirectX SDK' is found. r=mbanner.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -5337,17 +5337,17 @@ if test -n "$MOZ_ANGLE"; then
   # First try to get the June 2010 SDK
   MOZ_DIRECTX_SDK_REG_KEY=`reg query 'HKLM\Software\Microsoft\DirectX' //s | grep 'Microsoft DirectX SDK (June 2010)' | head -n 1`
   if test -z "$MOZ_DIRECTX_SDK_REG_KEY" ; then
     # Otherwise just take whatever comes first
     MOZ_DIRECTX_SDK_REG_KEY=`reg query 'HKLM\Software\Microsoft\DirectX' //s | grep 'Microsoft DirectX SDK' | head -n 1`
   fi
 
   if test -n "`echo $MOZ_DIRECTX_SDK_REG_KEY | grep 'February 2010'`" ; then
-    AC_MSG_WARN([Found the February 2010 DirectX SDK. This is too old. We now require the June 2010 DirectX SDK, or newer.])
+    AC_MSG_ERROR([Found the February 2010 DirectX SDK. This is too old. We now require the June 2010 DirectX SDK, or newer.  Upgrade your SDK or to explicitly build without ANGLE, reconfigure with --disable-angle.])
   else
     MOZ_DIRECTX_SDK_PATH=`reg query "$MOZ_DIRECTX_SDK_REG_KEY" //v InstallPath | grep REG_SZ | sed 's/.*\([[a-zA-Z]]\)\\:\\\\/\\1\\:\\\\/'`
   fi
 
   MOZ_ANGLE=
 
   if test -n "$MOZ_DIRECTX_SDK_PATH" ; then
     if test -f "$MOZ_DIRECTX_SDK_PATH"/include/d3dx9.h && test -f "$MOZ_DIRECTX_SDK_PATH"/lib/$MOZ_DIRECTX_SDK_CPU_SUFFIX/dxguid.lib ; then