Mesa (master): glx: Add missing glproto dependency for gallium-xlib glx

[Emil Velikov]

Module: Mesa
Branch: master
Commit: e9a4ec4bd806107223b4e3f656071de3a08756a0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e9a4ec4bd806107223b4e3f656071de3a08756a0

Author: Chuck Atkins <chuck.atkins at kitware.com>
Date:   Fri Jan  6 08:27:44 2017 -0500

glx: Add missing glproto dependency for gallium-xlib glx

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>
Reviewed-by: Bruce Cherniak <bruce.cherniak at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.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 49c5e25..bc92fb5 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 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 \