From c3e43a7e473023c327e91094cbe5b9d0a103ec21 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Fri, 18 Jun 2010 01:07:59 +0100 Subject: [PATCH] configure.ac: move the special handling of the fruity flavour After checking the flavour option the user gives we were checking for the fruity flavour to override the glesversion. Now that the glsl checking has been moved this can instead just wait until the AS_CASE that handles all the flavour configuration. --- configure.ac | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b7ea49781..5301e3e95 100644 --- a/configure.ac +++ b/configure.ac @@ -130,9 +130,6 @@ AC_ARG_WITH([gles], [Select Clutter GLES version (for EGL backends)])], [glesversion=$with_gles]) -# the fruity backend requires a different handling for GLES -AS_IF([test "x$CLUTTER_WINSYS" = "xfruity"], [glesversion=fruity]) - # backend specific pkg-config files BACKEND_PC_FILES="" @@ -225,6 +222,8 @@ AS_CASE([$CLUTTER_WINSYS], [Cogl supports OpenGLES using the EGL API with Fruity platform typedefs]) COGL_DRIVER="gles" + # the fruity backend requires a different handling for GLES + glesversion=fruity FLAVOUR_LIBS="$FLAVOUR_LIBS -ObjC -framework Foundation -framework CoreFoundation -framework CoreGraphics -framework CoreSurface -framework GraphicsServices -framework OpenGLES -framework LayerKit -framework UIKit" ],