xserver: Branch 'server-1.7-branch'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Sun Mar 13 15:10:20 PDT 2011
hw/xquartz/GL/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 94458a6e09761e3b7937bb639ea4c12972328c7f
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Sun Mar 13 15:10:00 2011 -0700
XQuartz GL: Add $(GL_CFLAGS) to CFLAGS
This fixes a build failure I found on tinderbox.
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
(cherry picked from commit f641e4b34aa91ecda29e546b8b975e72ce037ed0)
Conflicts:
hw/xquartz/GL/Makefile.am
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
diff --git a/hw/xquartz/GL/Makefile.am b/hw/xquartz/GL/Makefile.am
index 9b61305..4b9e0aa 100644
--- a/hw/xquartz/GL/Makefile.am
+++ b/hw/xquartz/GL/Makefile.am
@@ -1,5 +1,5 @@
noinst_LTLIBRARIES = libCGLCore.la
-AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
+AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) $(GL_CFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/glx \
More information about the xorg-commit
mailing list