summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorJohn Hein <5qgu8gvshg@snkmail.com>2010-07-01 12:53:28 -0700
committerDan Nicholson <dbn.lists@gmail.com>2010-07-01 13:00:02 -0700
commit9617254a1e5522615c96ab25c9e0a70e0d63d7e7 (patch)
tree1cd858151bd2d2551fbe778cf3d511afcf6b86f9 /configs
parentd2fe97a209134ff5267e8aa065865c3398bfb280 (diff)
Use GLUT_CFLAGS when building glut
Fix this build error (in MesaGLUT-7.6.1)... glut_cmap.c:23:66: error: X11/Xmu/StdCmap.h: No such file or directory ...by not preventing the cflags that pkg-config finds for glut dependencies (including 'xmu') from being used. Defining GLUT_CFLAGS before running the pkg-config prevents the cflags found by pkg-config from being used. This patch lets GLUT_CFLAGS that configure & pkg-config work so hard to set actually get used. Also make sure the generated configs/autoconf defines GLUT_CFLAGS used in (at least) src/glut/glx/Makefile. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Diffstat (limited to 'configs')
-rw-r--r--configs/autoconf.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in
index 417138b2a1..4a86dc1bb5 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -31,6 +31,7 @@ X11_CFLAGS = @X11_CFLAGS@
LLVM_CFLAGS = @LLVM_CFLAGS@
LLVM_LDFLAGS = @LLVM_LDFLAGS@
LLVM_LIBS = @LLVM_LIBS@
+GLUT_CFLAGS = @GLUT_CFLAGS@
# Source selection