diff options
author | Carsten Haitzler <raster@rasterman.com> | 2012-03-17 06:25:41 +0000 |
---|---|---|
committer | Carsten Haitzler <raster@rasterman.com> | 2012-03-17 06:25:41 +0000 |
commit | fed5f7943352b7bdd153c4a5564f6030728ee15e (patch) | |
tree | ba589cf604d18f54e369a9ada28415104012c286 /legacy/evas/m4/evas_check_engine.m4 | |
parent | 1bdfdad0691281cc351775d54d5fa7337920f0fa (diff) |
and work more on getting release in shape - version requirements.
(god this is a pain in the butt)
SVN revision: 69484
Diffstat (limited to '')
-rw-r--r-- | legacy/evas/m4/evas_check_engine.m4 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/legacy/evas/m4/evas_check_engine.m4 b/legacy/evas/m4/evas_check_engine.m4 index 06feef04fe..627579542d 100644 --- a/legacy/evas/m4/evas_check_engine.m4 +++ b/legacy/evas/m4/evas_check_engine.m4 | |||
@@ -131,7 +131,7 @@ if test "x$gl_flavor_gles" = "xyes" ; then | |||
131 | fi | 131 | fi |
132 | 132 | ||
133 | if test "x${have_dep}" = "xyes" ; then | 133 | if test "x${have_dep}" = "xyes" ; then |
134 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) | 134 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) |
135 | if test "x${have_dep}" = "xyes" ; then | 135 | if test "x${have_dep}" = "xyes" ; then |
136 | if test "x$2" = "xyes" ; then | 136 | if test "x$2" = "xyes" ; then |
137 | x_libs="${x_libs} -lX11 -lXext -lXrender" | 137 | x_libs="${x_libs} -lX11 -lXext -lXrender" |
@@ -168,7 +168,7 @@ else | |||
168 | if test "x${have_egl}" = "xyes" ; then | 168 | if test "x${have_egl}" = "xyes" ; then |
169 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) | 169 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) |
170 | if test "x${have_glesv2}" = "xyes" ; then | 170 | if test "x${have_glesv2}" = "xyes" ; then |
171 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) | 171 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) |
172 | if test "x${have_dep}" = "xyes" ; then | 172 | if test "x${have_dep}" = "xyes" ; then |
173 | evas_engine_[]$1[]_cflags="${x_cflags}" | 173 | evas_engine_[]$1[]_cflags="${x_cflags}" |
174 | evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" | 174 | evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" |
@@ -305,7 +305,7 @@ if test "x$gl_flavor_gles" = "xyes" ; then | |||
305 | fi | 305 | fi |
306 | 306 | ||
307 | if test "x${have_dep}" = "xyes" ; then | 307 | if test "x${have_dep}" = "xyes" ; then |
308 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) | 308 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) |
309 | if test "x${have_dep}" = "xyes" ; then | 309 | if test "x${have_dep}" = "xyes" ; then |
310 | if test "x$2" = "xyes" ; then | 310 | if test "x$2" = "xyes" ; then |
311 | x_libs="${x_libs} -lX11 -lXext -lXrender" | 311 | x_libs="${x_libs} -lX11 -lXext -lXrender" |
@@ -337,7 +337,7 @@ else | |||
337 | if test "x${have_egl}" = "xyes" ; then | 337 | if test "x${have_egl}" = "xyes" ; then |
338 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) | 338 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) |
339 | if test "x${have_glesv2}" = "xyes" ; then | 339 | if test "x${have_glesv2}" = "xyes" ; then |
340 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) | 340 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) |
341 | if test "x${have_dep}" = "xyes" ; then | 341 | if test "x${have_dep}" = "xyes" ; then |
342 | evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}" | 342 | evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}" |
343 | evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" | 343 | evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" |
@@ -481,7 +481,7 @@ LIBS="$LIBS_save" | |||
481 | AC_LANG_POP([Objective C]) | 481 | AC_LANG_POP([Objective C]) |
482 | 482 | ||
483 | if test "x${have_dep}" = "xyes" ; then | 483 | if test "x${have_dep}" = "xyes" ; then |
484 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) | 484 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) |
485 | fi | 485 | fi |
486 | 486 | ||
487 | AC_SUBST([evas_engine_$1_cflags]) | 487 | AC_SUBST([evas_engine_$1_cflags]) |
@@ -878,7 +878,7 @@ PKG_CHECK_MODULES([WAYLAND_EGL], | |||
878 | ) | 878 | ) |
879 | 879 | ||
880 | if test "x${have_dep}" = "xyes" ; then | 880 | if test "x${have_dep}" = "xyes" ; then |
881 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"]) | 881 | PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) |
882 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm) | 882 | AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm) |
883 | if test "x${have_glesv2}" = "xyes" ; then | 883 | if test "x${have_glesv2}" = "xyes" ; then |
884 | evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" | 884 | evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" |