From 001b6b8b70734db1fa2f68e45c1db8337ba9f662 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 15 Apr 2011 13:01:37 -0400
Subject: [PATCH] glx: Make --disable-dri not disable AIGLX

Either the DRI1 or DRI2 loaders are sufficient.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
 configure.ac    | 2 +-
 glx/Makefile.am | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9e04ff015..eeaa29b02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1006,7 +1006,7 @@ else
 fi
 AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
 
-if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then
+if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a \( "x$DRI" = xyes -o "x$DRI2" = xyes \); then
 	AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
 else
 	AIGLX=no
diff --git a/glx/Makefile.am b/glx/Makefile.am
index 72531f248..ef8677a7c 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -48,10 +48,13 @@ glapi_sources =					\
 	glthread.h
 
 libglxdri_la_SOURCES = \
-        glxdri.c \
         extension_string.c \
         extension_string.h
 
+if DRI
+libglxdri_la_SOURCES += glxdri.c
+endif
+
 if DRI2_AIGLX
 libglxdri_la_SOURCES += glxdri2.c
 endif