[PATCH 2/2] glx: Make --disable-dri not disable AIGLX

[Ian Romanick]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 04/12/2011 12:30 PM, Adam Jackson wrote:
> Either the DRI1 or DRI2 loaders are sufficient.
> 
> Signed-off-by: Adam Jackson <ajax at redhat.com>

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

> ---
>  configure.ac    |    2 +-
>  glx/Makefile.am |    5 ++++-
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 9e04ff0..74df770 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 "xDRI2" = xyes \); then
>  	AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
>  else
>  	AIGLX=no
> diff --git a/glx/Makefile.am b/glx/Makefile.am
> index 72531f2..ef8677a 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

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAk2k434ACgkQX1gOwKyEAw8YHACcCMFKKtLk/qoyzvhSnWROjFvU
UtwAn2ChjwdWb41CyjFg4zen/8L84/eQ
=Pxj2
-----END PGP SIGNATURE-----