From 3289fe03e87b7ca1d88c0a855bb8f4208404e7f1 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Sat, 29 Dec 2012 02:51:34 +0000 Subject: [PATCH] build: Exclude COGL_DEFINES and COGL_GL_HEADER_INCLUDES from Makefiles Some variables (notably multiline ones) are not really supposed to be substituted by automake. Let's take COGL_DEFINES for instance, you get: COGL_DEFINES = #define COGL_HAS_GLIB_SUPPORT #define COGL_HAS_GTYPE_SUPPORT #define COGL_HAS_GL #define CLUTTER_COGL_HAS_GL #define COGL_HAS_GLX_SUPPORT #define COGL_HAS_SDL ... This only works because the '#' character makes it look like a comment and COGL_DEFINES becomes an empty variable Automake allows to exclude variables from the list of substitutions, let's use it for those two. (cherry picked from commit e0a9d8d775c90c60b6e63b52771e896da3641a40) --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9ac55385c..4f5de0e6b 100644 --- a/configure.ac +++ b/configure.ac @@ -1223,7 +1223,7 @@ for x in $COGL_DEFINES_SYMBOLS; do #define $x 1" done; AC_SUBST(COGL_DEFINES) - +AM_SUBST_NOTMAKE(COGL_DEFINES) AS_IF([test "x$cogl_gl_headers" = "x"], [AC_MSG_ERROR([Internal error: no GL header set])]) @@ -1236,6 +1236,7 @@ for x in $cogl_gl_headers; do #include <$x>" done; AC_SUBST(COGL_GL_HEADER_INCLUDES) +AM_SUBST_NOTMAKE(COGL_GL_HEADER_INCLUDES) AC_DEFINE([COGL_ENABLE_EXPERIMENTAL_2_0_API], [1], [Can use Cogl 2.0 API internally])