From 780c6fe05ddc4b70cdff853927446d9c73624420 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Thu, 12 May 2011 15:51:01 +0100 Subject: [PATCH] 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 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index d7d0d08af..ac6a7fb24 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"])