diff options
| author | Carl Worth <cworth@cworth.org> | 2008-07-17 00:38:54 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2008-07-17 00:38:54 -0700 |
| commit | a6ad50402cb879b08de95f94959bb1f59701c1ff (patch) | |
| tree | 9ee9fc89a52d8791b272721a910ea5c11d4e4aa7 /configure.ac | |
| parent | e9916b9d496fd0b4df717892dda33f81a2e2990a (diff) | |
| parent | c4565a9811487402d899d0933cc63e27ffe1ff08 (diff) | |
Merge branch 'master' into drm-gem
Conflicts:
configure.ac
src/reg_dumper/Makefile.am
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index e62502c5..254fef4b 100644 --- a/configure.ac +++ b/configure.ac @@ -202,6 +202,10 @@ if test "$DRI" = yes; then PKG_CHECK_MODULES(DRI, [xf86driproto glproto]) AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) + PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.4.0],[DRI_MM=yes], [DRI_MM=no]) + if test "x$DRI_MM" = xyes; then + AC_DEFINE(XF86DRI_MM,1,[Extended DRI memory management]) + fi if test "$have_damage_h" = yes; then AC_DEFINE(DAMAGE,1,[Use Damage extension]) fi |