From be85fde82b148c4fc3639fcf3cfedb5de9381fc8 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@freedesktop.org>
Date: Thu, 10 Aug 2006 20:19:57 +0000
Subject: linux-indirect target fixes.

---
 configs/linux-dri     | 1 +
 src/glx/x11/Makefile  | 2 +-
 src/glx/x11/XF86dri.c | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configs/linux-dri b/configs/linux-dri
index 5b8f936abe..2a2b9e3f2c 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -37,6 +37,7 @@ ASM_SOURCES =
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib
 
+LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 3ecb744179..c509d4e085 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -47,7 +47,7 @@ INCLUDES = -I. \
 	-I$(TOP)/src/mesa/main \
 	-I$(TOP)/src/mesa/glapi \
 	-I$(TOP)/src/mesa/drivers/dri/common \
-        `pkg-config --cflags libdrm` \
+	$(LIBDRM_CFLAGS) \
 	$(X11_INCLUDES)
 
 
diff --git a/src/glx/x11/XF86dri.c b/src/glx/x11/XF86dri.c
index 3f989fa986..0ce588276b 100644
--- a/src/glx/x11/XF86dri.c
+++ b/src/glx/x11/XF86dri.c
@@ -37,6 +37,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD */
 
+#ifdef GLX_DIRECT_RENDERING
+
 #define NEED_REPLIES
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xext.h>
@@ -617,3 +619,5 @@ PUBLIC Bool XF86DRICloseFullScreen(dpy, screen, drawable)
     (void) drawable;
     return True;
 }
+
+#endif /* GLX_DIRECT_RENDERING */
-- 
cgit v1.2.3