diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-01-11 15:23:29 -0500 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-01-11 15:23:29 -0500 |
| commit | c6ef705e414c8e93ee471f50d15ada3492a9b067 (patch) | |
| tree | 5b037def16eaa6e58860f7b66d79fd75067a0cb2 /configure.ac | |
| parent | cca66dbb59673168d57b4e3499ccc31f4ddc86ad (diff) | |
| parent | 7c50d29f7ced3d60e52ee0146d982b49ea421de2 (diff) | |
Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa
Conflicts due to DRI1 removal:
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_screen.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 43069de1ea03..33437f54f89d 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_CANONICAL_HOST dnl Versions for external dependencies LIBDRM_REQUIRED=2.4.15 LIBDRM_RADEON_REQUIRED=2.4.17 -DRI2PROTO_REQUIRED=1.99.3 +DRI2PROTO_REQUIRED=2.2 dnl Check for progs AC_PROG_CPP |