From e9a4ec4bd806107223b4e3f656071de3a08756a0 Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Fri, 6 Jan 2017 08:27:44 -0500 Subject: [PATCH] glx: Add missing glproto dependency for gallium-xlib glx Cc: mesa-stable@lists.freedesktop.org Cc: Bruce Cherniak Signed-of-by: Chuck Atkins Reviewed-by: Bruce Cherniak Reviewed-by: Emil Velikov --- 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 49c5e256f2b..bc92fb5535c 100644 --- a/configure.ac +++ b/configure.ac @@ -1598,6 +1598,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 @@ -1611,7 +1614,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 a7e6c0c871a..112030be486 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.30.2