Backed out changeset 5b8582013988
authorGavin Sharp <gavin@gavinsharp.com>
Thu, 14 Oct 2010 14:30:31 -0400
changeset 55796 8c82c5840706fa57ada6490bd5ef3db8a78a8026
parent 55795 5b8582013988cc7bcba8ee395e3d7674836a3663
child 55797 60ce967b4a963082d35ec7d940d7ce68f7756426
push id16289
push usergsharp@mozilla.com
push dateThu, 14 Oct 2010 18:35:56 +0000
treeherdermozilla-central@43dc221c45ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b8pre
backs out5b8582013988cc7bcba8ee395e3d7674836a3663
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
Backed out changeset 5b8582013988
configure.in
--- a/configure.in
+++ b/configure.in
@@ -8439,20 +8439,17 @@ if test "$MOZ_TREE_CAIRO"; then
                 WIN32_DWRITE_FONT_FEATURE="#define CAIRO_HAS_DWRITE_FONT 1"
                 WIN32_D2D_SURFACE_FEATURE="#define CAIRO_HAS_D2D_SURFACE 1"
                 MOZ_ENABLE_D2D_SURFACE=1
                 MOZ_ENABLE_DWRITE_FONT=1
             fi
         fi
 
         AC_CHECK_HEADER(d3d9.h, MOZ_ENABLE_D3D9_LAYER=1)
-        dnl D3D10 Layers depend on D2D Surfaces.
-        if test -n "$WIN32_D2D_SURFACE_FEATURE"; then
-          AC_CHECK_HEADER(d3d10.h, MOZ_ENABLE_D3D10_LAYER=1)
-        fi
+        AC_CHECK_HEADER(d3d10.h, MOZ_ENABLE_D3D10_LAYER=1)
 
         AC_TRY_COMPILE([#include <ddraw.h>], [int foo = DDLOCK_WAITNOTBUSY;], HAS_DDRAW=1, HAS_DDRAW=)
         if test -z "$HAS_DDRAW"; then
             AC_MSG_WARN([DirectDraw ddraw.h header not found or it's missing DDLOCK_WAITNOTBUSY, disabling DirectDraw surface.  If you have an older SDK (such as the CE5 SDK), try copying in ddraw.lib and ddraw.h from the WM6 SDK.])
             DDRAW_SURFACE_FEATURE=
         else
             DDRAW_SURFACE_FEATURE="#define CAIRO_HAS_DDRAW_SURFACE 1"
         fi