From 854010d71dc0f1e9b73cdc764c9d2cf36f1da625 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 2 Sep 2005 03:22:01 +0000 Subject: [PATCH] Add -include dix-config.h to GL/mesa/X to catch _XSERVER64, et al. --- ChangeLog | 6 ++++++ GL/mesa/X/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index caf3dff6f..7b863fd0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-09-02 Daniel Stone + + * 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 * 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 \