diff options
| author | James Simmons <jsimmons@infradead.org> | 2012-03-01 14:26:41 -0500 |
|---|---|---|
| committer | James Simmons <jsimmons@infradead.org> | 2012-03-01 14:26:41 -0500 |
| commit | f0018c1e5a94afe7d47ade9b73d0e4926d0c8fba (patch) | |
| tree | c7539341bbcebfee8284d3cda82864d8ac7ac4e2 /configure.ac | |
| parent | 56cb0863aa7707ed0536ed9aeca15813011284ab (diff) | |
More fixes for DRI. Also add support for UDEV for hotplug events.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index c4e1d73..1168e64 100644 --- a/configure.ac +++ b/configure.ac @@ -113,12 +113,20 @@ fi if test "$DRI" != no; then PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto]) - AC_CHECK_HEADER([${sdkdir}/dri.h], + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS" + AC_CHECK_HEADER([dri.h], [have_dri_h="yes"], [have_dri_h="no"],[-]) - AC_CHECK_HEADER([${sdkdir}/sarea.h], + AC_CHECK_HEADER([sarea.h], [have_sarea_h="yes"], [have_sarea_h="no"],[-]) - AC_CHECK_HEADER([${sdkdir}/dristruct.h], +AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ +#include <xorg-server.h> +#include <dristruct.h> + ]])], [have_dristruct_h="yes"], [have_dristruct_h="no"],[-]) + AC_CHECK_HEADER([damage.h], + [have_damage_h="yes"], [have_damage_h="no"],[-]) + CPPFLAGS="$save_CPPFLAGS" fi AC_MSG_CHECKING([whether to include DRI support]) @@ -135,9 +143,24 @@ AC_MSG_RESULT([$DRI]) AM_CONDITIONAL(DRI, test x$DRI = xyes) if test "$DRI" = yes; then - PKG_CHECK_MODULES(DRI, [libdrm xf86driproto]) AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) + if test "$have_damage_h" = yes; then + AC_DEFINE(DAMAGE,1,[Use Damage extension]) + fi + + save_CFLAGS="$CFLAGS" + CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $CFLAGS" +AC_CHECK_HEADER(xf86drmMode.h,[DRM_MODE=yes],[DRM_MODE=no],[#include <stdint.h> +#include <stdlib.h>]) + if test "x$DRM_MODE" = xyes; then + PKG_CHECK_MODULES(LIBUDEV, [libudev], [LIBUDEV=yes], [LIBUDEV=no]) + if test "x$LIBUDEV" = xyes; then + AC_DEFINE(HAVE_LIBUDEV, 1,[libudev support]) + fi + fi + CFLAGS="$save_CFLAGS" + case "$host_cpu" in i*86) XVMC=yes ;; |