diff options
| author | Egbert Eich <eich@freedesktop.org> | 2009-12-07 11:39:47 +0100 |
|---|---|---|
| committer | Egbert Eich <eich@freedesktop.org> | 2010-01-18 18:53:28 +0100 |
| commit | 0b91ec067e338e8d5b0bdec9d646c63830d2d443 (patch) | |
| tree | a3df5bda051b2f53c6348d99135875428ebbf30b | |
| parent | 56fa25f40baa91b1f05a32cd5e4add96a07d8e61 (diff) | |
Configure: Only compile the KMS check code if xf86drmMode.h is actually present.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/rhd_driver.c | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 712e8e2..880046b 100644 --- a/configure.ac +++ b/configure.ac @@ -174,6 +174,12 @@ AC_MSG_RESULT($USE_DRI) test "x$USE_DRI" = xyes && AC_DEFINE(USE_DRI, 1, [Build support for DRI]) AM_CONDITIONAL(USE_DRI, test "x$USE_DRI" = xyes) +if test "x$USER_DRI" = "xyes"; then + AC_CHECK_HEADER([xf86drmMode.h], + [AC_DEFINE([HAVE_XF86DRMMODE_H], [1], + [Define to 1 if you have xf86drmMode.h])]) +fi + AC_CHECK_FILE([${sdkdir}/damage.h], [AC_DEFINE(DAMAGE,1,[Use Damage extension])], []) diff --git a/src/rhd_driver.c b/src/rhd_driver.c index a7447f3..e18519e 100644 --- a/src/rhd_driver.c +++ b/src/rhd_driver.c @@ -90,8 +90,10 @@ #define _XF86DRI_SERVER_ #include "dri.h" #include "GL/glxint.h" +#ifdef HAVE_XF86DRMMODE_H #include "xf86drmMode.h" #endif +#endif #if HAVE_XF86_ANSIC_H # include "xf86_ansic.h" @@ -402,6 +404,7 @@ RHDAvailableOptions(int chipid, int busid) */ #ifdef XSERVER_LIBPCIACCESS +#ifdef HAVE_XF86DRMMODE_H /* The radeon_kernel_mode_enabled() function is taken verbatim from * radeon's radeon_probe.c file. */ static Bool radeon_kernel_mode_enabled(ScrnInfoPtr pScrn, struct pci_device *pci_dev) @@ -428,6 +431,12 @@ static Bool radeon_kernel_mode_enabled(ScrnInfoPtr pScrn, struct pci_device *pci "[KMS] Kernel modesetting enabled.\n"); return TRUE; } +#else +static Bool radeon_kernel_mode_enabled(ScrnInfoPtr pScrn, struct pci_device *pci_dev) +{ + return FALSE; +} +#endif static Bool RHDPciProbe(DriverPtr drv, int entityNum, |