summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/linux-dri1
-rw-r--r--src/glx/x11/Makefile2
-rw-r--r--src/glx/x11/XF86dri.c4
3 files changed, 6 insertions, 1 deletions
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 */