linux-indirect target fixes.

diff --git a/configs/linux-dri b/configs/linux-dri
index 5b8f936abe1153c37f74e8ab6d9d4b838edaaa19..2a2b9e3f2ce0f6e39292aebbc893a867cd19d9ae 100644 (file)
--- 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 3ecb744179f3d94e52add72b18483448e90182f8..c509d4e08514901d5d61ce26253cc2631fcb837c 100644 (file)
--- 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 3f989fa986e147c17bc9b2f7461ecdb7fffc9a13..0ce588276be70dafd3919000fc31f56216bde8a8 100644 (file)
--- 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 */