From 31799da47fc367ead5a0b74f579fc288b0f99c55 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Thu, 1 Jul 2010 13:02:09 -0700 Subject: [PATCH] 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 (cherry picked from commit 9617254a1e5522615c96ab25c9e0a70e0d63d7e7) Conflicts: configs/autoconf.in --- configs/autoconf.in | 1 + configure.ac | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/autoconf.in b/configs/autoconf.in index fbd5faa5f2d..440b50bb810 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -26,6 +26,7 @@ INTEL_LIBS = @INTEL_LIBS@ INTEL_CFLAGS = @INTEL_CFLAGS@ X11_LIBS = @X11_LIBS@ X11_CFLAGS = @X11_CFLAGS@ +GLUT_CFLAGS = @GLUT_CFLAGS@ # Assembler MESA_ASM_SOURCES = @MESA_ASM_SOURCES@ diff --git a/configure.ac b/configure.ac index e711634ee59..121c386ed88 100644 --- a/configure.ac +++ b/configure.ac @@ -1102,10 +1102,6 @@ fi if test "x$enable_glut" = xyes; then SRC_DIRS="$SRC_DIRS glut/glx" - GLUT_CFLAGS="" - if test "x$GCC" = xyes; then - GLUT_CFLAGS="-fexceptions" - fi if test "$x11_pkgconfig" = yes; then PKG_CHECK_MODULES([GLUT],[x11 xmu xi]) GLUT_PC_REQ_PRIV="x11 xmu xi" @@ -1116,6 +1112,9 @@ if test "x$enable_glut" = xyes; then GLUT_PC_LIB_PRIV="$GLUT_LIB_DEPS" GLUT_PC_CFLAGS="$X11_INCLUDES" fi + if test "x$GCC" = xyes; then + GLUT_CFLAGS="$GLUT_CFLAGS -fexceptions" + fi GLUT_LIB_DEPS="$GLUT_LIB_DEPS -lm" GLUT_PC_LIB_PRIV="$GLUT_PC_LIB_PRIV -lm"