summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2008-04-02 19:21:41 -0400
committerKristian Høgsberg <krh@redhat.com>2008-04-02 19:21:41 -0400
commitb5a0a865c3045cc08c33388320d4ec3ab7065efb (patch)
tree21ce9f318c70d8e0e1eb9604a0fed81c44944c48
parent8cde0af3c57f0375ba8ba77af9fdf74b79d9496d (diff)
Pick up dri2proto from the standard proto header include path.
-rw-r--r--configure.ac2
-rw-r--r--hw/xfree86/dri2/dri2ext.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index e72e3b99a..985c8e227 100644
--- a/configure.ac
+++ b/configure.ac
@@ -860,7 +860,7 @@ AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
if test "x$DRI2" = xyes; then
# FIXME: Bump the versions once we have releases of these.
AC_DEFINE(DRI2, 1, [Build DRI2 extension])
- PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= 1.0.0])
+ PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= 1.1])
PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.1])
fi
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index d1d52a427..4ae0fda3a 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -37,12 +37,12 @@
#define NEED_REPLIES
#include <X11/X.h>
#include <X11/Xproto.h>
+#include <X11/extensions/dri2proto.h>
#include "dixstruct.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
#include "extnsionst.h"
#include "xf86drm.h"
-#include "dri2proto.h"
#include "dri2.h"
/* The only xf86 include */