author | Gavin Sharp <gavin@gavinsharp.com> |
Mon, 31 Jan 2011 16:17:56 -0500 | |
changeset 61666 | fe7b943b7a25fac7d8756a48bf4ca1d869b161c8 |
parent 61665 | 46d40c236f3d39f433269412e0af46d4dc62038d |
child 61667 | 1c6e36066e735a20661126bd0a825bcdd55ec45b |
push id | 18438 |
push user | gsharp@mozilla.com |
push date | Mon, 31 Jan 2011 21:19:00 +0000 |
treeherder | mozilla-central@fe7b943b7a25 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bustage |
milestone | 2.0b11pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
configure.in | file | annotate | diff | comparison | revisions |
--- a/configure.in +++ b/configure.in @@ -6350,21 +6350,21 @@ if test -n "$MOZ_ANGLE"; then if test -z "$_WIN32_MSVC"; then AC_MSG_ERROR([Building ANGLE requires MSVC. To build without ANGLE, reconfigure with --disable-angle.]) fi # remove trailing backslash MOZ_DIRECTX_SDK_PATH=`echo $DXSDK_DIR|sed 's/\\\\\$//'` 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/x86/dxguid.lib ; then - AC_MSG_RESULT([Found DirectX SDK via DXSDK_DIR, using $MOZ_DIRECTX_SDK_PATH]) - MOZ_ANGLE=1 - fi + 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/x86/dxguid.lib ; then + AC_MSG_RESULT([Found DirectX SDK via DXSDK_DIR, using $MOZ_DIRECTX_SDK_PATH]) + MOZ_ANGLE=1 + fi fi if test -z "$MOZ_ANGLE" ; then AC_MSG_WARN([Couldn't find the DirectX SDK, needed for ANGLE. Please install it (February 2010 or newer). To explicitly build without ANGLE, reconfigure with --disable-angle.]) AC_MSG_WARN([This will become an error in the future.]) fi fi fi