Mesa (master): egl: Build egl_dri2 only when DRI drivers are built.

Chia-I Wu olv at kemper.freedesktop.org
Fri Jul 16 11:51:58 UTC 2010


Module: Mesa
Branch: master
Commit: 39ae965783d43ecc4426d0340381c091518bdedb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=39ae965783d43ecc4426d0340381c091518bdedb

Author: Chia-I Wu <olv at lunarg.com>
Date:   Fri Jul 16 19:48:52 2010 +0800

egl: Build egl_dri2 only when DRI drivers are built.

That is, build egl_dri2 only when --with-driver=dri is given (the
default).

---

 configure.ac |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1b116ae..1214100 100644
--- a/configure.ac
+++ b/configure.ac
@@ -961,20 +961,21 @@ if test "x$enable_egl" = xyes; then
             EGL_DRIVERS_DIRS="glx"
         fi
 
-        # build egl_dri2 when xcb-dri2 is available
-        PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes],
-			  [have_xcb_dri2=yes],[have_xcb_dri2=no])
-	PKG_CHECK_MODULES([LIBUDEV], [libudev > 150],
-			  [have_libudev=yes],[have_libudev=no])
-
-        if test "$have_xcb_dri2" = yes; then
-	    EGL_DRIVER_DRI2=dri2
-            DEFINES="$DEFINES -DHAVE_XCB_DRI2"
-	    if test "$have_libudev" = yes; then
-	        DEFINES="$DEFINES -DHAVE_LIBUDEV"
-	    fi
-        fi
-
+        if test "$mesa_driver" = dri; then
+            # build egl_dri2 when xcb-dri2 is available
+            PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes],
+            		  [have_xcb_dri2=yes],[have_xcb_dri2=no])
+            PKG_CHECK_MODULES([LIBUDEV], [libudev > 150],
+            		  [have_libudev=yes],[have_libudev=no])
+            
+            if test "$have_xcb_dri2" = yes; then
+                EGL_DRIVER_DRI2=dri2
+                DEFINES="$DEFINES -DHAVE_XCB_DRI2"
+                if test "$have_libudev" = yes; then
+                    DEFINES="$DEFINES -DHAVE_LIBUDEV"
+                fi
+            fi
+	fi
 
         EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS $EGL_DRIVER_DRI2"
     fi




More information about the mesa-commit mailing list