OSDN Git Service

egl: Build egl_dri2 only when DRI drivers are built.
authorChia-I Wu <olv@lunarg.com>
Fri, 16 Jul 2010 11:48:52 +0000 (19:48 +0800)
committerChia-I Wu <olv@lunarg.com>
Fri, 16 Jul 2010 11:50:16 +0000 (19:50 +0800)
That is, build egl_dri2 only when --with-driver=dri is given (the
default).

configure.ac

index 1b116ae..1214100 100644 (file)
@@ -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