diff options
| author | Chuck Atkins <[email protected]> | 2017-01-06 08:27:44 -0500 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-01-12 22:01:55 +0000 |
| commit | e9a4ec4bd806107223b4e3f656071de3a08756a0 (patch) | |
| tree | 233ed1872a2d81f9c2e936fa7ae1dc8dbf5d3bcc | |
| parent | c90f921273d4d9108f12bbea9f0c42f6ca12d770 (diff) | |
glx: Add missing glproto dependency for gallium-xlib glx
Cc: [email protected]
Cc: Bruce Cherniak <[email protected]>
Signed-of-by: Chuck Atkins <[email protected]>
Reviewed-by: Bruce Cherniak <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/glx/xlib/Makefile.am | 1 |
2 files changed, 4 insertions, 1 deletions
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 \ |