diff -u -r1.5.6.1 Makefile.am
--- GL/mesa/glapi/Makefile.am	18 Jan 2006 07:21:41 -0000	1.5.6.1
+++ GL/mesa/glapi/Makefile.am	14 Feb 2006 15:24:34 -0000
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libglapi.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff -u -r1.9.4.2 Makefile.am
--- GL/mesa/main/Makefile.am	10 Feb 2006 20:45:24 -0000	1.9.4.2
+++ GL/mesa/main/Makefile.am	14 Feb 2006 15:24:34 -0000
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libmain.la
 
-AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE
+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \