From 518486e4ab87737e091a0de6c07ff07b9acfe4a1 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Thu, 14 Oct 2010 21:03:20 +0000
Subject: [PATCH] Bug 601358 - d3d10 compilation failure without d2d
 compilation enabled r=bas.schouten a=joe

---
 configure.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 2f209f4405b2..d611df4a726e 100644
--- a/configure.in
+++ b/configure.in
@@ -8427,7 +8427,11 @@ if test "$MOZ_TREE_CAIRO"; then
         fi
 
         AC_CHECK_HEADER(d3d9.h, MOZ_ENABLE_D3D9_LAYER=1)
-        AC_CHECK_HEADER(d3d10.h, MOZ_ENABLE_D3D10_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_TRY_COMPILE([#include <ddraw.h>], [int foo = DDLOCK_WAITNOTBUSY;], HAS_DDRAW=1, HAS_DDRAW=)
         if test -z "$HAS_DDRAW"; then