Mesa (master): egl: Only enable GLX backend if X11 EGL platform is enabled

Kristian Høgsberg krh at kemper.freedesktop.org
Fri Nov 30 16:06:52 UTC 2012


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

Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Thu Nov 29 15:11:13 2012 -0500

egl: Only enable GLX backend if X11 EGL platform is enabled

We don't want to compile in a bunch of X11 dependencies in libEGL if
we can't run EGL on X11.

---

 configure.ac |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4fb4544..fc554dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1273,10 +1273,6 @@ if test "x$enable_egl" = xyes; then
 
     if test "$enable_static" != yes; then
         # build egl_glx when libGL is built
-        if test "x$enable_glx" = xyes; then
-	    HAVE_EGL_DRIVER_GLX=1
-        fi
-
         PKG_CHECK_MODULES([LIBUDEV], [libudev > 150],
                           [have_libudev=yes],[have_libudev=no])
         if test "$have_libudev" = yes; then
@@ -1545,6 +1541,10 @@ for plat in $egl_platforms; do
 
 	x11)
 		PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 >= 1.8 xcb-xfixes])
+
+                if test "x$enable_glx" = xyes; then
+                        HAVE_EGL_DRIVER_GLX=1
+                fi
 		;;
 
 	drm)




More information about the mesa-commit mailing list