Bug 774062 - Make configure error out if the DirectX SDK redistributables cannot be found; r=ted
authorEd Morley <emorley@mozilla.com>
Wed, 22 Aug 2012 15:11:21 +0100
changeset 105066 8ce5250fe80f401eb955fade014cab9f9bb885ec
parent 105065 3ded80c6a2da0f5bbf6475e7ccaba395f152bc7d
child 105067 1c14ca0ce21fef10640fe6e633c025cc4d96333e
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewersted
bugs774062
milestone17.0a1
Bug 774062 - Make configure error out if the DirectX SDK redistributables cannot be found; r=ted
configure.in
--- a/configure.in
+++ b/configure.in
@@ -5769,16 +5769,20 @@ if test -n "$MOZ_ANGLE_RENDERER"; then
 
   if test -z "$MOZ_D3DX9_VERSION" ; then
   	AC_MSG_ERROR([Couldn't determine the D3DX9 version, needed for WebGL. Either reinstall the DirectX SDK (June 2010 version or newer), or reconfigure with --disable-webgl.])
   fi
 
   MOZ_D3DX9_CAB=`find "$MOZ_DIRECTX_SDK_PATH"/Redist -name *d3dx9_${MOZ_D3DX9_VERSION}_${MOZ_DIRECTX_SDK_CPU_SUFFIX}.cab | head -n1`
   MOZ_D3DCOMPILER_CAB=`find "$MOZ_DIRECTX_SDK_PATH"/Redist -name *D3DCompiler_${MOZ_D3DX9_VERSION}_${MOZ_DIRECTX_SDK_CPU_SUFFIX}.cab | head -n1`
 
+  if test -z "$MOZ_D3DX9_CAB" -o -z "$MOZ_D3DCOMPILER_CAB"; then
+    AC_MSG_ERROR([Couldn't find the DirectX redistributable files. Either reinstall the DirectX SDK (making sure the "DirectX Redistributable Files" option is selected), or reconfigure with --disable-webgl.])
+  fi
+
   MOZ_D3DX9_DLL=d3dx9_$MOZ_D3DX9_VERSION.dll
   MOZ_D3DCOMPILER_DLL=D3DCompiler_$MOZ_D3DX9_VERSION.dll
 fi
 
 dnl ========================================================
 dnl = Breakpad crash reporting (on by default on supported platforms)
 dnl ========================================================