diff options
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/i830_dri.c | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 53d23ed1..da9fd3f6 100644 --- a/configure.ac +++ b/configure.ac @@ -189,6 +189,14 @@ if test "$DRI" = yes; then if test "$have_damage_h" = yes; then AC_DEFINE(DAMAGE,1,[Use Damage extension]) fi + + save_CFLAGS="$CFLAGS" + CFLAGS="$DRI_CFLAGS" + AC_CHECK_TYPE(drm_i915_flip_t, + [AC_DEFINE(HAVE_I915_FLIP, 1, + [Have drm_i915_flip_t and related definitions])], + [], [#include <i915_drm.h>]) + CFLAGS="$save_CFLAGS" fi AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes) diff --git a/src/i830_dri.c b/src/i830_dri.c index 6ec56cf9..ca1190cf 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -83,8 +83,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "i915_drm.h" -/* This block can be removed when libdrm >= 2.3.1 is required. */ -#ifndef DRM_IOCTL_I915_FLIP +/* This block and the corresponding configure test can be removed when + * libdrm >= 2.3.1 is required. + */ +#ifndef HAVE_I915_FLIP #define DRM_VBLANK_FLIP 0x8000000 |