summaryrefslogtreecommitdiff
path: root/legacy/evas/m4/evas_check_engine.m4
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2011-11-16 05:34:37 +0000
committerCarsten Haitzler <raster@rasterman.com>2011-11-16 05:34:37 +0000
commit9e655af267a6935fe01580c54ab155e46555f3ff (patch)
tree5f6417a92c3b449b4a0d69ceca3fc335a6ad46e7 /legacy/evas/m4/evas_check_engine.m4
parentc164909d692caf90e286bfa3dd472e1d7582ee03 (diff)
update release candidate trees to their release version in preparation
for alpha SVN revision: 65280
Diffstat (limited to '')
-rw-r--r--legacy/evas/m4/evas_check_engine.m410
1 files changed, 5 insertions, 5 deletions
diff --git a/legacy/evas/m4/evas_check_engine.m4 b/legacy/evas/m4/evas_check_engine.m4
index 8c9fb590ed..52941002e2 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.4.0], [have_dep="yes"], [have_dep="no"]) 134 PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.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.4.0], [have_dep="yes"], [have_dep="no"]) 171 PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.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"
@@ -306,7 +306,7 @@ if test "x$gl_flavor_gles" = "xyes" ; then
306fi 306fi
307 307
308if test "x${have_dep}" = "xyes" ; then 308if test "x${have_dep}" = "xyes" ; then
309 PKG_CHECK_MODULES([GL_EET], [eet >= 1.4.0], [have_dep="yes"], [have_dep="no"]) 309 PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
310 if test "x${have_dep}" = "xyes" ; then 310 if test "x${have_dep}" = "xyes" ; then
311 if test "x$2" = "xyes" ; then 311 if test "x$2" = "xyes" ; then
312 x_libs="${x_libs} -lX11 -lXext -lXrender" 312 x_libs="${x_libs} -lX11 -lXext -lXrender"
@@ -338,7 +338,7 @@ else
338 if test "x${have_egl}" = "xyes" ; then 338 if test "x${have_egl}" = "xyes" ; then
339 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) 339 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
340 if test "x${have_glesv2}" = "xyes" ; then 340 if test "x${have_glesv2}" = "xyes" ; then
341 PKG_CHECK_MODULES([GL_EET], [eet >= 1.4.0], [have_dep="yes"], [have_dep="no"]) 341 PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
342 if test "x${have_dep}" = "xyes" ; then 342 if test "x${have_dep}" = "xyes" ; then
343 evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}" 343 evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}"
344 evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" 344 evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
@@ -483,7 +483,7 @@ LIBS="$LIBS_save"
483AC_LANG_POP([Objective C]) 483AC_LANG_POP([Objective C])
484 484
485if test "x${have_dep}" = "xyes" ; then 485if test "x${have_dep}" = "xyes" ; then
486 PKG_CHECK_MODULES([GL_EET], [eet >= 1.4.0], [have_dep="yes"], [have_dep="no"]) 486 PKG_CHECK_MODULES([GL_EET], [eet >= 1.5.0], [have_dep="yes"], [have_dep="no"])
487fi 487fi
488 488
489AC_SUBST([evas_engine_$1_cflags]) 489AC_SUBST([evas_engine_$1_cflags])