From 9617254a1e5522615c96ab25c9e0a70e0d63d7e7 Mon Sep 17 00:00:00 2001 From: John Hein <5qgu8gvshg@snkmail.com> Date: Thu, 1 Jul 2010 12:53:28 -0700 Subject: 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 --- configs/autoconf.in | 1 + 1 file changed, 1 insertion(+) (limited to 'configs') 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 -- cgit v1.2.3