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:22:05 -0400
commit81af92f5d912869f928967b1b45f8ac0b6bee8d0 (patch)
tree3df4c9510c4dd3a236cdc4764285cd436becb6f0
parent856d9dd61548f3b45c5ea64bbde51c8f96307c38 (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 62e142b79..a65cc1a5c 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 */