diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-08 18:11:13 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-08 18:11:13 -0700 |
| commit | 173b909a71955997ed6366e70faebf63fe922a8e (patch) | |
| tree | a3e65942bab390647105db99cc9fbb6d6c6f8bee /configure.ac | |
| parent | b1aef6f63c151dcb202fce869e4b80598b4b2052 (diff) | |
Make it actually build the kernel stuff if possible
Fixup the kernel stuff to have a slightly better chance of working. Still need
to fixup the EXA pixmap functions.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 61202271..87dad694 100644 --- a/configure.ac +++ b/configure.ac @@ -85,12 +85,16 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) +drm_cflags=$(pkg-config --cflags libdrm) # Checks for libraries. # Checks for header files. AC_HEADER_STDC +save_CFLAGS="$CFLAGS" +CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags" +CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags" AC_MSG_CHECKING([whether to include DRI support]) if test x$DRI = xauto; then AC_CHECK_FILE([${sdkdir}/dri.h], @@ -101,7 +105,9 @@ if test x$DRI = xauto; then [have_dristruct_h="yes"], [have_dristruct_h="no"]) AC_CHECK_FILE([${sdkdir}/damage.h], [have_damage_h="yes"], [have_damage_h="no"]) - AC_CHECK_HEADER(xf86drmMode.h,[DRM_MODE=yes],[DRM_MODE=no],[#include "stdint.h"]) + AC_CHECK_HEADER(xf86drmMode.h, + [DRM_MODE=yes],[DRM_MODE=no] + [#include "stdint.h"]) if test "x$DRM_MODE" = xyes; then AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting]) fi @@ -116,8 +122,6 @@ if test x$DRI = xauto; then fi AC_MSG_RESULT([$DRI]) -save_CFLAGS="$CFLAGS" -CFLAGS="$XORG_CFLAGS" AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"]) AC_CHECK_DECL(XSERVER_LIBPCIACCESS, [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no], |