summaryrefslogtreecommitdiff
path: root/legacy/evas/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
parentc164909d692caf90e286bfa3dd472e1d7582ee03 (diff)
update release candidate trees to their release version in preparation
for alpha SVN revision: 65280
Diffstat (limited to 'legacy/evas/m4')
-rw-r--r--legacy/evas/m4/evas_check_engine.m410
-rw-r--r--legacy/evas/m4/evas_check_loader.m46
2 files changed, 8 insertions, 8 deletions
diff --git a/legacy/evas/m4/evas_check_engine.m4 b/legacy/evas/m4/evas_check_engine.m4
index 8c9fb59..5294100 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])
diff --git a/legacy/evas/m4/evas_check_loader.m4 b/legacy/evas/m4/evas_check_loader.m4
index 989cd74..e1fb5a9 100644
--- a/legacy/evas/m4/evas_check_loader.m4
+++ b/legacy/evas/m4/evas_check_loader.m4
@@ -37,7 +37,7 @@ have_dep="no"
37evas_image_loader_[]$1[]_cflags="" 37evas_image_loader_[]$1[]_cflags=""
38evas_image_loader_[]$1[]_libs="" 38evas_image_loader_[]$1[]_libs=""
39 39
40PKG_CHECK_MODULES([EET], [eet >= 1.4.0], [have_dep="yes" requirement="eet >= 1.4.0"], [have_dep="no"]) 40PKG_CHECK_MODULES([EET], [eet >= 1.5.0], [have_dep="yes" requirement="eet >= 1.4.0"], [have_dep="no"])
41evas_image_loader_[]$1[]_cflags="${EET_CFLAGS}" 41evas_image_loader_[]$1[]_cflags="${EET_CFLAGS}"
42evas_image_loader_[]$1[]_libs="${EET_LIBS}" 42evas_image_loader_[]$1[]_libs="${EET_LIBS}"
43 43
@@ -542,7 +542,7 @@ AC_MSG_CHECKING([whether to enable Eet font loader])
542AC_MSG_RESULT([${want_loader}]) 542AC_MSG_RESULT([${want_loader}])
543 543
544if test "x$want_loader" = "xyes" -o "x$want_loader" = "xauto"; then 544if test "x$want_loader" = "xyes" -o "x$want_loader" = "xauto"; then
545 PKG_CHECK_MODULES([EET], [eet >= 1.4.0], [have_evas_font_loader_eet="yes"], [have_evas_font_loader_eet="no"]) 545 PKG_CHECK_MODULES([EET], [eet >= 1.5.0], [have_evas_font_loader_eet="yes"], [have_evas_font_loader_eet="no"])
546fi 546fi
547 547
548if test "x${have_evas_font_loader_eet}" = "xno" -a "x$want_loader" = "xyes" -a "x$use_strict" = "xyes" ; then 548if test "x${have_evas_font_loader_eet}" = "xno" -a "x$want_loader" = "xyes" -a "x$use_strict" = "xyes" ; then
@@ -551,7 +551,7 @@ fi
551 551
552if test "x$have_evas_font_loader_eet" = "xyes" ; then 552if test "x$have_evas_font_loader_eet" = "xyes" ; then
553 AC_DEFINE([BUILD_FONT_LOADER_EET], [1], [EET Font Loader Support]) 553 AC_DEFINE([BUILD_FONT_LOADER_EET], [1], [EET Font Loader Support])
554 requirement_evas="eet >= 1.4.0 ${requirement_evas}" 554 requirement_evas="eet >= 1.5.0 ${requirement_evas}"
555fi 555fi
556 556
557popdef([UP]) 557popdef([UP])