isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Exclude COGL_DEFINES and COGL_GL_HEADER_INCLUDES from Makefiles

Browse Source 
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)
This commit is contained in:
Damien Lespiau 2012-12-29 02:51:34 +00:00 committed by Robert Bragg
parent b8d9bbed1a
commit 3289fe03e8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -1223,7 +1223,7 @@ for x in $COGL_DEFINES_SYMBOLS; do
#define $x 1" #define $x 1"
done; done;
AC_SUBST(COGL_DEFINES) AC_SUBST(COGL_DEFINES)
AM_SUBST_NOTMAKE(COGL_DEFINES)
AS_IF([test "x$cogl_gl_headers" = "x"], AS_IF([test "x$cogl_gl_headers" = "x"],
[AC_MSG_ERROR([Internal error: no GL header set])]) [AC_MSG_ERROR([Internal error: no GL header set])])
@ -1236,6 +1236,7 @@ for x in $cogl_gl_headers; do
#include <$x>" #include <$x>"
done; done;
AC_SUBST(COGL_GL_HEADER_INCLUDES) AC_SUBST(COGL_GL_HEADER_INCLUDES)
AM_SUBST_NOTMAKE(COGL_GL_HEADER_INCLUDES)
AC_DEFINE([COGL_ENABLE_EXPERIMENTAL_2_0_API], [1], AC_DEFINE([COGL_ENABLE_EXPERIMENTAL_2_0_API], [1],
[Can use Cogl 2.0 API internally]) [Can use Cogl 2.0 API internally])