[Cogl] [PATCH 2/3] build: Exclude COGL_DEFINES and COGL_GL_HEADER_INCLUDES from Makefiles

[Damien Lespiau]

From: Damien Lespiau <damien.lespiau at intel.com>

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.
---
 configure.ac |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 59f5ce7..32e95f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1200,7 +1200,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])])
@@ -1213,6 +1213,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])
-- 
1.7.7.5