[PATCH 1/1] configure.ac: Move GLX section after DRI

[Ian Romanick]

On 11/08/2013 02:12 AM, Jeremy Huddleston Sequoia wrote:
> The GLX section of configura.ac checks the state of DRI2, so it
> needs to be after DRI2=auto is resolved.
> 
> Also reset libgl requirement to 7.1.0 in non-dri2 case.

Apologies if I'm being daft... Is this patch right?  I don't see any
change to line 816 (the 'LIBGL="gl >= 9.2.0"' line).  I also don't see
anything in the patch body mentioning 7.1.0.

> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
> CC: Ian Romanick <idr at freedesktop.org>
> ---
>  configure.ac | 57 +++++++++++++++++++++++++++++----------------------------
>  1 file changed, 29 insertions(+), 28 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 0d855f2..f4f3569 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1068,34 +1068,6 @@ fi
>  AC_MSG_RESULT([$CLIENTIDS])
>  AM_CONDITIONAL(CLIENTIDS, [test "x$CLIENTIDS" = xyes])
>  
> -if test "x$GLX" = xyes; then
> -	PKG_CHECK_MODULES([XLIB], [x11])
> -	PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL)
> -	AC_SUBST(XLIB_CFLAGS)
> -	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
> -	GLX_LIBS='$(top_builddir)/glx/libglx.la'
> -	GLX_SYS_LIBS="$GLX_SYS_LIBS -lGL"
> -else
> -        GLX=no
> -fi
> -AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
> -
> -if test "x$GLX" = xno; then
> -        AIGLX=no
> -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)
> -
> -if test "x$GLX_USE_TLS" = xyes ; then
> -	GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
> -	GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread"
> -fi
> -AC_SUBST([GLX_DEFINES])
> -AC_SUBST([GLX_SYS_LIBS])
> -
>  AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
>  if test "x$DRI" = xyes; then
>  	AC_DEFINE(XF86DRI, 1, [Build DRI extension])
> @@ -1112,6 +1084,7 @@ case "$DRI2,$HAVE_DRI2PROTO" in
>  	yes,yes | auto,yes)
>  		AC_DEFINE(DRI2, 1, [Build DRI2 extension])
>  		DRI2=yes
> +		LIBGL="gl >= 9.2.0"
>  		SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"
>  		;;
>  esac
> @@ -1160,6 +1133,34 @@ if test "x$DRI2" = xyes; then
>  fi
>  AM_CONDITIONAL(DRI2_AIGLX, test "x$DRI2_AIGLX" = xyes)
>  
> +if test "x$GLX" = xyes; then
> +	PKG_CHECK_MODULES([XLIB], [x11])
> +	PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL)
> +	AC_SUBST(XLIB_CFLAGS)
> +	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
> +	GLX_LIBS='$(top_builddir)/glx/libglx.la'
> +	GLX_SYS_LIBS="$GLX_SYS_LIBS -lGL"
> +else
> +        GLX=no
> +fi
> +AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
> +
> +if test "x$GLX" = xno; then
> +        AIGLX=no
> +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)
> +
> +if test "x$GLX_USE_TLS" = xyes ; then
> +	GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
> +	GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread"
> +fi
> +AC_SUBST([GLX_DEFINES])
> +AC_SUBST([GLX_SYS_LIBS])
> +
>  AM_CONDITIONAL(PRESENT, [test "x$PRESENT" = xyes])
>  if test "x$PRESENT" = xyes; then
>  	AC_DEFINE(PRESENT, 1, [Support Present extension])
>