From 2eb7a2fccd5416d56fd88618ed3138aeeaf0da1c Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Fri, 5 Feb 2010 10:46:11 +0800
Subject: [PATCH] configure.ac: Check for xcb-dri2 to enable EGL dri2 driver.

Check that xcb-dri2 is available before including EGL dri2 driver into
EGL_DRIVERS_DIRS.
---
 configure.ac | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 16d315e13ad..b6f71f90430 100644
--- a/configure.ac
+++ b/configure.ac
@@ -911,13 +911,18 @@ if test "x$enable_egl" = xyes; then
     SRC_DIRS="$SRC_DIRS egl"
     EGL_LIB_DEPS="$DLOPEN_LIBS -lpthread"
     EGL_DRIVERS_DIRS=""
-    if test "$enable_static" != yes && test "$mesa_driver" != osmesa; then
+    if test "$enable_static" != yes; then
         # build egl_glx when libGL is built
-        EGL_DRIVERS_DIRS="glx"
-    fi
-    if test "$mesa_driver" == dri; then
-        # build egl_dri2 when dri is enabled
-        EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS dri2"
+        if test "$mesa_driver" != osmesa; then
+            EGL_DRIVERS_DIRS="glx"
+        fi
+
+        # build egl_dri2 when xcb-dri2 is available
+        PKG_CHECK_EXISTS([x11-xcb xcb-dri2 xcb-xfixes],
+			 [have_xcb_dri2=yes],[have_xcb_dri2=no])
+        if test "$have_xcb_dri2" = yes; then
+            EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS dri2"
+        fi
     fi
 fi
 AC_SUBST([EGL_LIB_DEPS])
-- 
2.30.2