Mesa (master): Revert "configure: use enable_dri_glx local variable"

[Emil Velikov]

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

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Tue Mar  4 02:13:48 2014 +0000

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).

---

 configure.ac |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1bd02c4..d54cba3 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)