summaryrefslogtreecommitdiff
path: root/legacy/evas/m4
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-07-09 10:20:21 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-07-09 10:20:21 +0000
commit5c9c0852bb6a346d3baadd38d828c089cc6095db (patch)
tree3f68fc60d1083a97dc703ce07d8d3b1ebf03dd5f /legacy/evas/m4
parent54e0eb0c8b78b78b0189ccdab26b1040cfc57715 (diff)
update all versions in @sincs, README's and configure.ac's etc. to
reflect a unified release version, for now 1.6.99. SVN revision: 73498
Diffstat (limited to 'legacy/evas/m4')
-rw-r--r--legacy/evas/m4/evas_check_engine.m412
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 a0e1dfe..d4db2aa 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
131fi 131fi
132 132
133if test "x${have_dep}" = "xyes" ; then 133if test "x${have_dep}" = "xyes" ; then
134 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) 134 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [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.6.0], [have_dep="yes"], [have_dep="no"]) 171 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [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
305fi 305fi
306 306
307if test "x${have_dep}" = "xyes" ; then 307if test "x${have_dep}" = "xyes" ; then
308 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) 308 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [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.6.0], [have_dep="yes"], [have_dep="no"]) 340 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [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"
481AC_LANG_POP([Objective C]) 481AC_LANG_POP([Objective C])
482 482
483if test "x${have_dep}" = "xyes" ; then 483if test "x${have_dep}" = "xyes" ; then
484 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) 484 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
485fi 485fi
486 486
487AC_SUBST([evas_engine_$1_cflags]) 487AC_SUBST([evas_engine_$1_cflags])
@@ -851,7 +851,7 @@ PKG_CHECK_MODULES([WAYLAND_EGL],
851) 851)
852 852
853if test "x${have_dep}" = "xyes" ; then 853if test "x${have_dep}" = "xyes" ; then
854 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"]) 854 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
855 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm) 855 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm)
856 if test "x${have_glesv2}" = "xyes" ; then 856 if test "x${have_glesv2}" = "xyes" ; then
857 evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" 857 evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"