diff options
| author | Christian König <[email protected]> | 2011-03-03 00:59:12 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-03-03 00:59:12 +0100 |
| commit | 0eccb1038a620bc76ba45ac00c293b3e88427510 (patch) | |
| tree | 4bd9209ac6e9b824284d47799b13a99a401c6963 /configure.ac | |
| parent | ed12c29bc45b100b758c9affe2cebe8c8498e25e (diff) | |
| parent | 2e756f3d6f15d61297a3bb4efe6a88c29081a5eb (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 19455eed186..d69fb7c4958 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_CONFIG_AUX_DIR([bin]) AC_CANONICAL_HOST dnl Versions for external dependencies -LIBDRM_REQUIRED=2.4.23 -LIBDRM_RADEON_REQUIRED=2.4.23 -LIBDRM_INTEL_REQUIRED=2.4.23 +LIBDRM_REQUIRED=2.4.24 +LIBDRM_RADEON_REQUIRED=2.4.24 +LIBDRM_INTEL_REQUIRED=2.4.24 DRI2PROTO_REQUIRED=2.1 GLPROTO_REQUIRED=1.4.11 -LIBDRM_XORG_REQUIRED=2.4.23 +LIBDRM_XORG_REQUIRED=2.4.24 LIBKMS_XORG_REQUIRED=1.0.0 dnl Check for progs @@ -1162,6 +1162,9 @@ if test "x$enable_egl" = xyes; then if test "$have_libudev" = yes; then DEFINES="$DEFINES -DHAVE_LIBUDEV" fi + # workaround a bug in xcb-dri2 generated by xcb-proto 1.6 + AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [], + [DEFINES="$DEFINES -DXCB_DRI2_CONNECT_DEVICE_NAME_BROKEN"]) fi fi @@ -1608,7 +1611,7 @@ yes) GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/fbdev" fi if test "$plat" = "wayland"; then - PKG_CHECK_MODULES([WAYLAND], [wayland-client],, \ + PKG_CHECK_MODULES([WAYLAND], [wayland-client wayland-server],, \ [AC_MSG_ERROR([cannot find libwayland-client])]) WAYLAND_EGL_LIB_DEPS="$WAYLAND_LIBS $LIBDRM_LIBS" fi |