summaryrefslogtreecommitdiff
path: root/GL/mesa
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-12-13 17:35:26 +0000
committerAdam Jackson <ajax@nwnk.net>2005-12-13 17:35:26 +0000
commitcf605eb91619a8c0589a08674ffc3e018471b3fc (patch)
tree004ec7b73fff84758d6cac64dd2640a9c70b6ecf /GL/mesa
parentb076dd787ff71c4b385ab4e2e4eb367f3de378f6 (diff)
Build libglx correctly when not building the Xorg DDX.
Diffstat (limited to 'GL/mesa')
-rw-r--r--GL/mesa/X/Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index 46b7e82f2..e51f9e8f3 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -16,7 +16,10 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(top_srcdir)/GL/include \
-I$(top_srcdir)/hw/xfree86/os-support
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+# -DXFree86Server is required because the X11 driver in Mesa thinks that
+# symbol means "being built in the server"
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
+ -DXFree86Server
libX_la_SOURCES = xf86glx.c \
xf86glx_util.c \