From c963d75dfdeec11f82e79e727062fbf89afa2c04 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 22 Apr 2012 09:19:23 +1000
Subject: Update EFL to latest beta.

---
 libraries/evas/m4/evas_check_engine.m4 | 66 ++++++----------------------------
 1 file changed, 11 insertions(+), 55 deletions(-)

(limited to 'libraries/evas/m4/evas_check_engine.m4')

diff --git a/libraries/evas/m4/evas_check_engine.m4 b/libraries/evas/m4/evas_check_engine.m4
index 4fc13a9..6275795 100644
--- a/libraries/evas/m4/evas_check_engine.m4
+++ b/libraries/evas/m4/evas_check_engine.m4
@@ -131,7 +131,7 @@ if test "x$gl_flavor_gles" = "xyes" ; then
 fi
 
 if test "x${have_dep}" = "xyes" ; then
-   PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
+   PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"])
    if test "x${have_dep}" = "xyes" ; then
       if test "x$2" = "xyes" ; then
          x_libs="${x_libs} -lX11 -lXext -lXrender"
@@ -168,13 +168,12 @@ else
    if test "x${have_egl}" = "xyes" ; then
       AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
       if test "x${have_glesv2}" = "xyes" ; then
-         PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
+         PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"])
          if test "x${have_dep}" = "xyes" ; then
             evas_engine_[]$1[]_cflags="${x_cflags}"
             evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
             evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
             have_dep="yes"
-            gl_flavor_gles="no"
             AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
             gles_variety_sgx="yes"
          fi
@@ -306,7 +305,7 @@ if test "x$gl_flavor_gles" = "xyes" ; then
 fi
 
 if test "x${have_dep}" = "xyes" ; then
-   PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
+   PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"])
    if test "x${have_dep}" = "xyes" ; then
       if test "x$2" = "xyes" ; then
          x_libs="${x_libs} -lX11 -lXext -lXrender"
@@ -338,13 +337,12 @@ else
    if test "x${have_egl}" = "xyes" ; then
       AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
       if test "x${have_glesv2}" = "xyes" ; then
-         PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
+         PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"])
          if test "x${have_dep}" = "xyes" ; then
             evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}"
             evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
             evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
             have_dep="yes"
-            gl_flavor_gles="no"
             AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
             gles_variety_sgx="yes"
          fi
@@ -483,7 +481,7 @@ LIBS="$LIBS_save"
 AC_LANG_POP([Objective C])
 
 if test "x${have_dep}" = "xyes" ; then
-   PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
+   PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"])
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
@@ -497,43 +495,6 @@ fi
 
 ])
 
-
-dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-
-AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_SDL],
-[
-
-requirement=""
-have_dep="no"
-evas_engine_[]$1[]_cflags=""
-evas_engine_[]$1[]_libs=""
-
-PKG_CHECK_MODULES([SDL],
-   [sdl >= 1.2.0],
-   [
-    have_dep="yes"
-    requirement="sdl"
-    evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
-    evas_engine_[]$1[]_libs="${SDL_LIBS}"
-   ]
-)
-
-AC_SUBST([evas_engine_$1_cflags])
-AC_SUBST([evas_engine_$1_libs])
-
-if test "x$3" = "xstatic" ; then
-   requirement_evas="${requirement} ${requirement_evas}"
-fi
-
-if test "x${have_dep}" = "xyes" ; then
-  m4_default([$4], [:])
-else
-  m4_default([$5], [:])
-fi
-
-])
-
-
 dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
 
 AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL],
@@ -645,7 +606,6 @@ else
          evas_engine_[]$1[]_libs="${SDL_LIBS} -lGLESv2 -lEGL -lm $gl_pt_lib"
          evas_engine_gl_common_libs="-lGLESv2 -lm $gl_pt_lib"
          have_dep="yes"
-         gl_flavor_gles="no"
          AC_DEFINE(GLES_VARIETY_SGX, 1, [Imagination SGX GLES2 support])
          gles_variety_sgx="yes"
       fi
@@ -918,16 +878,12 @@ PKG_CHECK_MODULES([WAYLAND_EGL],
 )
 
 if test "x${have_dep}" = "xyes" ; then
-   PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
-   AC_CHECK_HEADER([GLES2/gl2.h],
-      [have_egl="yes"],
-      [have_egl="no"],
-      [
-      ])
-   if test "x${have_egl}" = "xyes" ; then
-      evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
-      evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS} -lGL -lGLESv2 -lEGL"
-   fi
+   PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"])
+      AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm)
+      if test "x${have_glesv2}" = "xyes" ; then
+         evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
+         evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS} -lGL -lGLESv2 -lEGL"
+      fi
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
-- 
cgit v1.1