[cogl/wip/android: 4/12] build: Ensure EGL related variables are defined even when EGL_CHECKED=yes



commit 979ee875b35b512c6d095227807c49e803b652ad
Author: Damien Lespiau <damien lespiau intel com>
Date:   Thu May 12 15:51:01 2011 +0100

    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

 configure.ac |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d7d0d08..ac6a7fb 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"])
 
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]