summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorairlied <airlied@optimus.localdomain>2006-12-01 10:32:57 +1100
committerairlied <airlied@optimus.localdomain>2006-12-01 10:32:57 +1100
commite87285c2a042db12ccecf340a1db917c71fd8bae (patch)
treeccecd9ba5b3a92d757f0bc1f7230145e78993665 /configure.ac
parent69820a10e33e4582c192360996e866007114639d (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 (cherry picked from fd91630b73100e9d77ccb492c52807448bc772a5 commit)
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 51c3d2807..5b26741da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -615,10 +615,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
@@ -1744,7 +1745,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