diff options
| author | Emil Velikov <[email protected]> | 2014-03-04 02:13:48 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-03-04 02:13:48 +0000 |
| commit | 1a568e0f2b65e4e1e1d19a6dece3a792a33da825 (patch) | |
| tree | 4f626ff23aacc23bc07950a19212fce0e15bb13f /configure.ac | |
| parent | 1bb23abe0659559ec95d6d20cdcfc67b48619286 (diff) | |
Revert "configure: use enable_dri_glx local variable"
This reverts commit dfe8cb48fc13587afb2d829c29432c0eacd0aba3.
Accidently pushed this commit, over 1bb23abe065(configure: disable
shared glapi when building xlib powered glx).
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 1bd02c4a7eb..d54cba36d3c 100644 --- a/configure.ac +++ b/configure.ac @@ -703,16 +703,13 @@ AM_CONDITIONAL(NEED_OPENGL_COMMON, test "x$enable_opengl" = xyes -o \ "x$enable_gles1" = xyes -o \ "x$enable_gles2" = xyes) -enable_dri_glx=$enable_dri - if test "x$enable_glx" = xno; then AC_MSG_WARN([GLX disabled, disabling Xlib-GLX]) enable_xlib_glx=no - enable_dri_glx=no fi -if test "x$enable_dri_glx$enable_xlib_glx" = xyesyes; then - AC_MSG_ERROR([DRI-GLX and Xlib-GLX cannot be built together]) +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 @@ -725,16 +722,16 @@ if test "x$enable_glx$enable_opengl" = xyesno; then enable_glx=no fi -# Disable GLX if DRI-GLX and Xlib-GLX are not enabled +# Disable GLX if DRI and Xlib-GLX are not enabled if test "x$enable_glx" = xyes -a \ - "x$enable_dri_glx" = xno -a \ + "x$enable_dri" = xno -a \ "x$enable_xlib_glx" = xno; then - AC_MSG_WARN([Neither DRI-GLX nor Xlib-GLX enabled, disabling GLX]) + AC_MSG_WARN([Neither DRI nor Xlib-GLX enabled, disabling GLX]) enable_glx=no fi AM_CONDITIONAL(HAVE_DRI_GLX, test "x$enable_glx" = xyes -a \ - "x$enable_dri_glx" = xyes) + "x$enable_dri" = xyes) AM_CONDITIONAL(HAVE_DRI, test "x$enable_dri" = xyes) AM_CONDITIONAL(HAVE_DRI3, test "x$enable_dri3" = xyes) |