xserver/GL patch

[Stefan Dirsch]

Hi

Find attached a patch I needed for compiling xserver/xorg when using
Mesa included by the monolithic tree. CVS sources from today. I wonder
nobody else needed a similar patch ("error: GL/gl.h not found").

Best regards,
Stefan

Public Key available
------------------------------------------------------
Stefan Dirsch (Res. & Dev.)   SUSE LINUX Products GmbH
Tel: 0911-740 53 0            Maxfeldstraße 5
FAX: 0911-740 53 479          D-90409 Nürnberg
http://www.suse.de            Germany 
------------------------------------------------------
-------------- next part --------------
--- ./xserver/xorg/hw/dmx/input/Makefile.am.orig	2005-08-02 12:50:32.000000000 +0000
+++ ./xserver/xorg/hw/dmx/input/Makefile.am	2005-08-02 12:51:08.000000000 +0000
@@ -53,5 +53,6 @@
 
 AM_CFLAGS = -I$(top_srcdir)/hw/dmx \
             -I$(top_srcdir)/hw/xfree86/common \
+            -I at MESA_SOURCE@/include \
             -DHAVE_DMX_CONFIG_H \
             @DMXMODULES_CFLAGS@
--- ./xserver/xorg/hw/dmx/config/Makefile.am.orig	2005-08-02 12:56:26.000000000 +0000
+++ ./xserver/xorg/hw/dmx/config/Makefile.am	2005-08-02 12:57:00.000000000 +0000
@@ -20,5 +20,5 @@
 
 libdmxconfig_a_SOURCES = $(LIBSRCS)
 
-AM_CFLAGS = -I$(top_srcdir)/hw/dmx -DHAVE_DMX_CONFIG_H @DMXMODULES_CFLAGS@
+AM_CFLAGS = -I$(top_srcdir)/hw/dmx -I at MESA_SOURCE@/include -DHAVE_DMX_CONFIG_H @DMXMODULES_CFLAGS@
 AM_YFLAGS = -d
--- ./xserver/xorg/hw/dmx/glxProxy/Makefile.am.orig	2005-08-02 13:40:35.000000000 +0000
+++ ./xserver/xorg/hw/dmx/glxProxy/Makefile.am	2005-08-02 13:41:04.000000000 +0000
@@ -34,5 +34,6 @@
 AM_CFLAGS = -I$(top_srcdir)/hw/dmx \
             -I$(top_srcdir)/include \
             -I$(top_srcdir)/GL/include \
+            -I at MESA_SOURCE@/include \
             -DHAVE_DMX_CONFIG_H \
             @DMXMODULES_CFLAGS@
--- ./xserver/xorg/hw/dmx/Makefile.am.orig	2005-08-02 13:31:55.000000000 +0000
+++ ./xserver/xorg/hw/dmx/Makefile.am	2005-08-02 13:32:50.000000000 +0000
@@ -11,7 +11,7 @@
 SUBDIRS += glxProxy
 GLX_LIBS = glxProxy/libglxproxy.a
 GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c dmx_glxvisuals.h
-GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
+GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod -I at MESA_SOURCE@/include
 endif
 
 Xdmx_SOURCES = dmx.c \