[PATCH] dri2: Unbreak DRI2 AIGLX

[Jasper St. Pierre]

Should you change (default: auto) ?


On Wed, Oct 30, 2013 at 6:26 PM, Adam Jackson <ajax at redhat.com> wrote:

> DRI2 AIGLX was defaulting to 'auto', the tests for building the actual
> loader were checking for 'yes', whoops.  This ought to be a check for
> the appropriate DRI2 protocol bits, but this is good enough for an RC.
>
> Signed-off-by: Adam Jackson <ajax at redhat.com>
> ---
>  configure.ac | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index d29f170..0859252 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -612,7 +612,7 @@ AC_ARG_ENABLE(xdmcp,
>  AS_HELP_STRING([--disable-xdmcp], [Build XDMCP ext
>  AC_ARG_ENABLE(xdm-auth-1,     AS_HELP_STRING([--disable-xdm-auth-1],
> [Build XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval],
> [XDMAUTH=auto])
>  AC_ARG_ENABLE(glx,            AS_HELP_STRING([--disable-glx], [Build GLX
> extension (default: enabled)]), [GLX=$enableval], [GLX=yes])
>  AC_ARG_ENABLE(dri,            AS_HELP_STRING([--enable-dri], [Build DRI
> extension (default: auto)]), [DRI=$enableval])
> -AC_ARG_ENABLE(dri2,           AS_HELP_STRING([--enable-dri2], [Build DRI2
> extension (default: auto)]), [DRI2=$enableval], [DRI2=auto])
> +AC_ARG_ENABLE(dri2,           AS_HELP_STRING([--enable-dri2], [Build DRI2
> extension (default: auto)]), [DRI2=$enableval], [DRI2=yes])
>  AC_ARG_ENABLE(xinerama,              AS_HELP_STRING([--disable-xinerama],
> [Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval],
> [XINERAMA=yes])
>  AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode],
> [Build XF86VidMode extension (default: auto)]), [XF86VIDMODE=$enableval],
> [XF86VIDMODE=auto])
>  AC_ARG_ENABLE(xace,           AS_HELP_STRING([--disable-xace], [Build
> X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
> @@ -1083,7 +1083,7 @@ fi
>  if test "x$AIGLX" = xyes -a \( "x$DRI2" = xyes \); then
>         AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
>  fi
> -AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI2" = xyes; } && test
> "x$AIGLX" = xyes)
> +AM_CONDITIONAL(AIGLX_DRI_LOADER, test "x$DRI2" = xyes && test "x$AIGLX" =
> xyes)
>
>  if test "x$GLX_USE_TLS" = xyes ; then
>         GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
> --
> 1.8.3.1
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>



-- 
  Jasper
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20131030/2af8961f/attachment.html>