diff options
| author | Robert Bragg <robert@linux.intel.com> | 2011-04-18 15:57:32 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2011-05-03 11:43:24 +0100 |
| commit | 234b114a6d6b4adb28ced076211093a9dc26e325 (patch) | |
| tree | 4a0fd576721a292dfd92379b7b8c8405d6257fd8 | |
| parent | 2837aae6b962aec31defc9aff983a965dfcb9830 (diff) | |
| download | clutter-234b114a6d6b4adb28ced076211093a9dc26e325.tar.gz | |
cogl/configure.ac: make COGL_HAS_xyz defines public
Instead of using AC_DEFINE for the various COGL_HAS_PLATFORM defines
this now adds them to the COGL_DEFINES_SYMBOLS variable which gets
substituted into the public cogl-defines.h header.
| -rw-r--r-- | clutter/cogl/configure.ac | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/clutter/cogl/configure.ac b/clutter/cogl/configure.ac index 354ac346f..2ae792d41 100644 --- a/clutter/cogl/configure.ac +++ b/clutter/cogl/configure.ac @@ -426,8 +426,7 @@ AS_IF([test "x$enable_null_egl_platform" = "xyes"], NEED_EGL=yes EGL_PLATFORMS="$EGL_PLATFORMS null" - AC_DEFINE([COGL_HAS_EGL_PLATFORM_POWERVR_NULL_SUPPORT], [1], - [Cogl supports NULL EGL platform typedefs]) + COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_POWERVR_NULL_SUPPORT" ]) AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_NULL, [test "x$enable_null_egl_platform" = "xyes"]) @@ -475,8 +474,7 @@ AS_IF([test "x$enable_xlib_egl_platform" = "xyes"], NEED_XLIB=yes EGL_PLATFORMS="$EGL_PLATFORMS xlib" - AC_DEFINE([COGL_HAS_EGL_PLATFORM_POWERVR_X11_SUPPORT], [1], - [Cogl supports Xlib based EGL platform typedefs]) + COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_POWERVR_X11_SUPPORT" ]) AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_X11, [test "x$enable_xlib_egl_platform" = "xyes"]) @@ -505,6 +503,7 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], ) SUPPORT_EGL=yes GL_WINSYS_APIS="$GL_WINSYS_APIS egl" + COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_SUPPORT" ]) AM_CONDITIONAL(SUPPORT_EGL, [test "x$SUPPORT_EGL" = "xyes"]) @@ -520,11 +519,6 @@ AS_IF([test "x$NEED_XLIB" = "xyes"], SUPPORT_X11=yes SUPPORT_XLIB=yes - AC_DEFINE([COGL_HAS_X11_SUPPORT], [1], - [Cogl supports the X11 window system]) - AC_DEFINE([COGL_HAS_XLIB_SUPPORT], [1], - [Cogl supports X11 using the Xlib API]) - COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_X11" COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_X11_SUPPORT" COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_XLIB" |