fix X #includes so they're relative to X11/ directory (bug 4047)

diff --git a/src/glx/x11/XF86dri.c b/src/glx/x11/XF86dri.c
index d0b7f72554776eba9a4265a86617ecca9a704ad7..03fa4e57bcebb2a0c4ba4ea2b5fa20967fc147e6 100644 (file)
--- a/src/glx/x11/XF86dri.c
+++ b/src/glx/x11/XF86dri.c
@@ -40,7 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NEED_REPLIES
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xext.h>
-#include "extutil.h"
+#include <X11/extensions/extutil.h>
 #include "glheader.h"
 #include "xf86dristr.h"
 

diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index 6ebf21d40284f0f72d9434a900e605f9f0b862ac..516ca508c5d47cd19e365fabb805b29d86e8c768 100644 (file)
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <unistd.h>
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xext.h>
-#include "extutil.h"
+#include <X11/extensions/extutil.h>
 #include "glxclient.h"
 #include "xf86dri.h"
 #include "sarea.h"

diff --git a/src/glx/x11/glx_pbuffer.c b/src/glx/x11/glx_pbuffer.c
index 9e91fd519f4d16c222de729e4b2bf7022149004a..83c550559c0c596e0cab9c682f108cc269489284 100644 (file)
--- a/src/glx/x11/glx_pbuffer.c
+++ b/src/glx/x11/glx_pbuffer.c
@@ -31,8 +31,8 @@
 
 #include <inttypes.h>
 #include "glxclient.h"
-#include <extutil.h>
-#include <Xext.h>
+#include <X11/extensions/extutil.h>
+#include <X11/extensions/Xext.h>
 #include <assert.h>
 #include <string.h>
 #include "glapi.h"

diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index 093deab3b9b8f1b1af99a987efe50d3c122a77ab..6a31f24dd8cc7641d8dabf74a7363d42f992e4f3 100644 (file)
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -41,14 +41,14 @@
 
 #include <inttypes.h>
 #include "glxclient.h"
-#include <extutil.h>
-#include <Xext.h>
+#include <X11/extensions/extutil.h>
+#include <X11/extensions/Xext.h>
 #include <assert.h>
 #include <string.h>
 #include "glapi.h"
 #ifdef GLX_DIRECT_RENDERING
 #include "indirect_init.h"
-#include "xf86vmode.h"
+#include <X11/extensions/xf86vmode.h>
 #include "xf86dri.h"
 #endif
 #include "glxextensions.h"

diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index 1fd2099a7f92890aa5698eef022d4e53adc05097..eb6e870e9840a3a1b522b78585dc628d48dce0ef 100644 (file)
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -46,8 +46,8 @@
 
 #include "glxclient.h"
 #include <stdio.h>
-#include <Xext.h>
-#include <extutil.h>
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/extutil.h>
 #include <assert.h>
 #include "indirect_init.h"
 #include "glapi.h"

diff --git a/src/glx/x11/glxextensions.c b/src/glx/x11/glxextensions.c
index 7c5d9719a630f444335c6eadbbf88f589e76ea0b..d2597981cf304e3855ef69bfab48a99a1fa35fd9 100644 (file)
--- a/src/glx/x11/glxextensions.c
+++ b/src/glx/x11/glxextensions.c
@@ -29,8 +29,8 @@
  */
 
 #include "glxclient.h"
-#include <extutil.h>
-#include <Xext.h>
+#include <X11/extensions/extutil.h>
+#include <X11/extensions/Xext.h>
 #include <string.h>
 #include "glapi.h"
 #include "glxextensions.h"