[cogl/cogl-1.14: 103/174] build: Exclude COGL_DEFINES and COGL_GL_HEADER_INCLUDES from Makefiles

[Robert Bragg <rbragg src gnome org>]

commit 3289fe03e87b7ca1d88c0a855bb8f4208404e7f1
Author: Damien Lespiau <damien lespiau intel com>
Date:   Sat Dec 29 02:51:34 2012 +0000

    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 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9ac5538..4f5de0e 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])