summaryrefslogtreecommitdiff
path: root/legacy/evas/m4
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-03-17 06:25:41 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-03-17 06:25:41 +0000
commitfed5f7943352b7bdd153c4a5564f6030728ee15e (patch)
treeba589cf604d18f54e369a9ada28415104012c286 /legacy/evas/m4
parent1bdfdad0691281cc351775d54d5fa7337920f0fa (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 'legacy/evas/m4')
-rw-r--r--legacy/evas/m4/evas_check_engine.m412
-rw-r--r--legacy/evas/m4/evas_check_loader.m46
2 files changed, 9 insertions, 9 deletions
diff --git a/legacy/evas/m4/evas_check_engine.m4 b/legacy/evas/m4/evas_check_engine.m4
index 06feef0..6275795 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.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
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.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"
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.5.0], [have_dep="yes"], [have_dep="no"]) 484 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.0], [have_dep="yes"], [have_dep="no"])
485fi 485fi
486 486
487AC_SUBST([evas_engine_$1_cflags]) 487AC_SUBST([evas_engine_$1_cflags])
@@ -878,7 +878,7 @@ PKG_CHECK_MODULES([WAYLAND_EGL],
878) 878)
879 879
880if test "x${have_dep}" = "xyes" ; then 880if 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}"
diff --git a/legacy/evas/m4/evas_check_loader.m4 b/legacy/evas/m4/evas_check_loader.m4
index e1fb5a9..a265094 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.5.0], [have_dep="yes" requirement="eet >= 1.4.0"], [have_dep="no"]) 40PKG_CHECK_MODULES([EET], [eet >= 1.6.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.5.0], [have_evas_font_loader_eet="yes"], [have_evas_font_loader_eet="no"]) 545 PKG_CHECK_MODULES([EET], [eet >= 1.6.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.5.0 ${requirement_evas}" 554 requirement_evas="eet >= 1.6.0 ${requirement_evas}"
555fi 555fi
556 556
557popdef([UP]) 557popdef([UP])