summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--GL/mesa/X/Makefile.am2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index caf3dff6f..7b863fd0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-02 Daniel Stone <daniel@freedesktop.org>
+
+ * GL/mesa/X/Makefile.am:
+ Add -include dix-config.h to CFLAGS so we pickup _XSERVER64 and other
+ assorted vaguely useful macros; this unbreaks GLcore on amd64.
+
2005-09-01 Daniel Stone <daniel@freedesktop.org>
* configure.ac:
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index 4d5b8daeb..66b571cff 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(top_srcdir)/GL/include
# terribly gross hack. i need a shower now.
-AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server
+AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server -include xorg-server.h
libX_la_SOURCES = xf86glx.c \
xf86glx_util.c \