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>
This commit is contained in:
Adam Jackson 2011-04-15 13:01:37 -04:00
parent f8540b9dcc
commit 001b6b8b70
2 changed files with 5 additions and 2 deletions

View File

@ -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

View File

@ -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