Pick up dri2proto from the standard proto header include path.

diff --git a/configure.ac b/configure.ac
index 8598a0d2d8035558cc2f8d66551dddba2615173c..48921e010e2d5150787f526f4f0e322db1dcde8f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -388,7 +388,7 @@ dri)
 
     # Check for libdrm
     PKG_CHECK_MODULES(LIBDRM, libdrm)
-    PKG_CHECK_MODULES(DRI2PROTO, dri2proto)
+    PKG_CHECK_MODULES(DRI2PROTO, dri2proto >= 1.1)
 
     # find the DRI deps for libGL
     if test "$x11_pkgconfig" = yes; then

diff --git a/src/glx/x11/dri2.c b/src/glx/x11/dri2.c
index c3012c4e5fb1132763b3050eae8a73960e049739..e7044ab424832cbef8200183f684eaf9627dd722 100644 (file)
--- a/src/glx/x11/dri2.c
+++ b/src/glx/x11/dri2.c
@@ -35,9 +35,9 @@
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
+#include <X11/extensions/dri2proto.h>
 #include "glheader.h"
 #include "xf86drm.h"
-#include "dri2proto.h"
 #include "dri2.h"
 
 static char dri2ExtensionName[] = DRI2_NAME;