diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2011-05-12 15:51:01 +0100 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2011-05-17 15:24:54 +0100 |
| commit | 780c6fe05ddc4b70cdff853927446d9c73624420 (patch) | |
| tree | 10a0e163ea87d5fdcc8a3a86ef0771187b58d3e9 | |
| parent | 3530354d5d5da1248cc6636dbf3837294f0a2121 (diff) | |
| download | cogl-780c6fe05ddc4b70cdff853927446d9c73624420.tar.gz | |
build: Ensure EGL related variables are defined even when EGL_CHECKED=yes
When checking for EGL earlier in the configure script (ie EGL_CHECKED is
"yes"), we did not execute some EGL code. Let's split that code in two:
- A first part that has a last change to check for EGL
- A second one that defines variables and that should always been run
in an EGL build
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index d7d0d08a..ac6a7fb2 100644 --- a/configure.ac +++ b/configure.ac @@ -644,12 +644,17 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL" ] ) + ]) + +AS_IF([test "x$NEED_EGL" = "xyes"], + [ SUPPORT_EGL=yes GL_WINSYS_APIS="$GL_WINSYS_APIS egl" COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_SUPPORT" AC_DEFINE([COGL_HAS_FULL_WINSYS], [1], [Cogl can create its own OpenGL context]) ]) + AM_CONDITIONAL(SUPPORT_EGL, [test "x$SUPPORT_EGL" = "xyes"]) |