glx: Add missing glproto dependency for gallium-xlib glx
Cc: mesa-stable@lists.freedesktop.org Cc: Bruce Cherniak <bruce.cherniak@intel.com> Signed-of-by: Chuck Atkins <chuck.atkins@kitware.com> Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
parent
c90f921273
commit
e9a4ec4bd8
|
@ -1598,6 +1598,9 @@ AC_ARG_ENABLE([driglx-direct],
|
||||||
dnl
|
dnl
|
||||||
dnl libGL configuration per driver
|
dnl libGL configuration per driver
|
||||||
dnl
|
dnl
|
||||||
|
if test "x$enable_glx" != xno; then
|
||||||
|
PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
|
||||||
|
fi
|
||||||
case "x$enable_glx" in
|
case "x$enable_glx" in
|
||||||
xxlib | xgallium-xlib)
|
xxlib | xgallium-xlib)
|
||||||
# Xlib-based GLX
|
# Xlib-based GLX
|
||||||
|
@ -1611,7 +1614,6 @@ xxlib | xgallium-xlib)
|
||||||
;;
|
;;
|
||||||
xdri)
|
xdri)
|
||||||
# DRI-based GLX
|
# DRI-based GLX
|
||||||
PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
|
|
||||||
|
|
||||||
# find the DRI deps for libGL
|
# find the DRI deps for libGL
|
||||||
dri_modules="x11 xext xdamage xfixes x11-xcb xcb xcb-glx >= $XCBGLX_REQUIRED"
|
dri_modules="x11 xext xdamage xfixes x11-xcb xcb xcb-glx >= $XCBGLX_REQUIRED"
|
||||||
|
|
|
@ -25,6 +25,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
|
||||||
|
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
$(GALLIUM_CFLAGS) \
|
$(GALLIUM_CFLAGS) \
|
||||||
|
$(GLPROTO_CFLAGS) \
|
||||||
$(X11_INCLUDES)
|
$(X11_INCLUDES)
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
|
|
Loading…
Reference in New Issue