[Mesa-dev] [PATCH] configure.ac: Disable GLX if OpenGL is not enabled

[Michel Dänzer]

From: Michel Dänzer <michel.daenzer at amd.com>

GLX uses mapi/glapi/libglapi.la, which is only built for OpenGL.

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 configure.ac |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/configure.ac b/configure.ac
index cfd52bf..62cc32b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -701,6 +701,14 @@ if test "x$enable_dri$enable_xlib_glx" = xyesyes; then
     AC_MSG_ERROR([DRI and Xlib-GLX cannot be built together])
 fi
 
+# Disable GLX if OpenGL is not enabled
+if test "x$enable_glx" = xyes -a \
+        "x$enable_opengl" = xno; then
+    AC_MSG_WARN([OpenGL not enabled, disabling GLX])
+    enable_glx=no
+    enable_xlib_glx=no
+fi
+
 # Disable GLX if DRI and Xlib-GLX are not enabled
 if test "x$enable_glx" = xyes -a \
         "x$enable_dri" = xno -a \
-- 
1.7.10.4