[Mesa-dev] [PATCH] glx: Add missing glproto dependency for gallium-xlib glx

[Cherniak, Bruce]

This comes in very handy on a SLES11 (or similar) based install.

Reviewed-by: Bruce Cherniak <bruce.cherniak at intel.com>

> On Jan 6, 2017, at 7:27 AM, Chuck Atkins <chuck.atkins at kitware.com> wrote:
> 
> Cc: mesa-stable at lists.freedesktop.org
> Cc: Bruce Cherniak <bruce.cherniak at intel.com>
> Signed-of-by: Chuck Atkins <chuck.atkins at kitware.com>
> ---
> configure.ac                                    | 4 +++-
> src/gallium/state_trackers/glx/xlib/Makefile.am | 1 +
> 2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/configure.ac b/configure.ac
> index d1ffb57..092bea0 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1597,6 +1597,9 @@ AC_ARG_ENABLE([driglx-direct],
> dnl
> dnl libGL configuration per driver
> dnl
> +if test "x$enable_glx" != xno; then
> +    PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
> +fi
> case "x$enable_glx" in
> xxlib | xgallium-xlib)
>     # Xlib-based GLX
> @@ -1610,7 +1613,6 @@ xxlib | xgallium-xlib)
>     ;;
> xdri)
>     # DRI-based GLX
> -    PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
> 
>     # find the DRI deps for libGL
>     dri_modules="x11 xext xdamage xfixes x11-xcb xcb xcb-glx >= $XCBGLX_REQUIRED"
> diff --git a/src/gallium/state_trackers/glx/xlib/Makefile.am b/src/gallium/state_trackers/glx/xlib/Makefile.am
> index a7e6c0c..112030be 100644
> --- a/src/gallium/state_trackers/glx/xlib/Makefile.am
> +++ b/src/gallium/state_trackers/glx/xlib/Makefile.am
> @@ -25,6 +25,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
> 
> AM_CFLAGS = \
> 	$(GALLIUM_CFLAGS) \
> +	$(GLPROTO_CFLAGS) \
> 	$(X11_INCLUDES)
> AM_CPPFLAGS = \
> 	-I$(top_srcdir)/include \
> -- 
> 2.7.4
>