From a8f8287154bfebc8bade25703ef252d251386186 Mon Sep 17 00:00:00 2001 From: Michel Dänzer Date: Thu, 31 Jan 2013 11:47:55 +0100 Subject: configure.ac: GLX cannot work without OpenGL GLX uses mapi/glapi/libglapi.la, which is only built for OpenGL. If the user specified --enable-xlib-glx --disable-opengl, error out, as these cannot be both observed at the same time. If the user just specified --disable-opengl but not --disable-glx, print a warning and disable GLX as well. NOTE: This is a candidate for the stable branches. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59364 Tested-by: Tom Stellard (cherry picked from commit 3b888f534cd42065b01ede8b9c646a2be0015509) --- configure.ac | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/configure.ac b/configure.ac index 2f0f1103bc..09ff8804fa 100644 --- a/configure.ac +++ b/configure.ac @@ -706,6 +706,16 @@ if test "x$enable_dri$enable_xlib_glx" = xyesyes; then AC_MSG_ERROR([DRI and Xlib-GLX cannot be built together]) fi +if test "x$enable_opengl$enable_xlib_glx" = xnoyes; then + AC_MSG_ERROR([Xlib-GLX cannot be built without OpenGL]) +fi + +# Disable GLX if OpenGL is not enabled +if test "x$enable_glx$enable_opengl" = xyesno; then + AC_MSG_WARN([OpenGL not enabled, disabling GLX]) + enable_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 \ -- cgit v1.2.3