diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-11-09 09:30:33 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-11-09 09:30:33 +1100 |
| commit | fd91630b73100e9d77ccb492c52807448bc772a5 (patch) | |
| tree | 44892b9943ff32d18960488fe39265fbba9b8f0c /configure.ac | |
| parent | 0409e1627a167db2efc1355f292d3c02a6989ffc (diff) | |
make X server use system libdrm - this requires libdrm >= 2.3.0
This patch blacklists the load "drm" line, moves some functions in dri module
links dri module against libdrm, and removes the X copy of libdrm
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 314840329..0977ee385 100644 --- a/configure.ac +++ b/configure.ac @@ -654,10 +654,11 @@ AM_CONDITIONAL(DRI, test "x$DRI" = xyes) if test "x$DRI" = xyes; then AC_DEFINE(XF86DRI, 1, [Build DRI extension]) PKG_CHECK_MODULES([DRIPROTO], [xf86driproto]) - PKG_CHECK_MODULES([LIBDRM], [libdrm]) + PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.0]) PKG_CHECK_MODULES([GL], [glproto >= 1.4.1]) AC_SUBST(DRIPROTO_CFLAGS) AC_SUBST(LIBDRM_CFLAGS) + AC_SUBST(LIBDRM_LIBS) AC_SUBST(GL_CFLAGS) fi @@ -1840,7 +1841,6 @@ hw/xfree86/loader/Makefile hw/xfree86/os-support/Makefile hw/xfree86/os-support/bsd/Makefile hw/xfree86/os-support/bus/Makefile -hw/xfree86/os-support/drm/Makefile hw/xfree86/os-support/hurd/Makefile hw/xfree86/os-support/misc/Makefile hw/xfree86/os-support/linux/Makefile |