diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-04-15 13:01:37 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2011-05-04 13:15:58 -0400 |
| commit | 7688d6d317f809028394ea6c5ffa31424e853796 (patch) | |
| tree | e8128062084d933d00c843bd5a0aa9d88421c4ca | |
| parent | e67afcdb9a6a634d6903da3f272aed7dab0e91b3 (diff) | |
glx: Make --disable-dri not disable AIGLXserver-1.10-iglx
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>
(cherry picked from commit 001b6b8b70734db1fa2f68e45c1db8337ba9f662)
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | glx/Makefile.am | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 756733e9e..949db90a8 100644 --- a/configure.ac +++ b/configure.ac @@ -1009,7 +1009,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 8c7f7a544..091c18bee 100644 --- a/glx/Makefile.am +++ b/glx/Makefile.am @@ -49,10 +49,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 |