diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/edje/configure.ac | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to '')
-rw-r--r-- | libraries/edje/configure.ac | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/libraries/edje/configure.ac b/libraries/edje/configure.ac index eceed6c..8ac6b7c 100644 --- a/libraries/edje/configure.ac +++ b/libraries/edje/configure.ac | |||
@@ -1,12 +1,12 @@ | |||
1 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 1 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
3 | m4_define([v_maj], [1]) | 3 | m4_define([v_maj], [1]) |
4 | m4_define([v_min], [1]) | 4 | m4_define([v_min], [2]) |
5 | m4_define([v_mic], [99]) | 5 | m4_define([v_mic], [0]) |
6 | m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) | 6 | m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) |
7 | m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) | 7 | m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) |
8 | ##-- When released, remove the dnl on the below line | 8 | ##-- When released, remove the dnl on the below line |
9 | dnl m4_undefine([v_rev]) | 9 | m4_undefine([v_rev]) |
10 | ##-- When doing snapshots - change soname. remove dnl on below line | 10 | ##-- When doing snapshots - change soname. remove dnl on below line |
11 | dnl m4_define([relname], [ver-pre-svn-07]) | 11 | dnl m4_define([relname], [ver-pre-svn-07]) |
12 | dnl m4_define([v_rel], [-release relname]) | 12 | dnl m4_define([v_rel], [-release relname]) |
@@ -18,7 +18,7 @@ m4_define([lt_age], v_min) | |||
18 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 18 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
19 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 19 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
20 | 20 | ||
21 | AC_INIT([edje], [v_ver], [enlightenment-devel@lists.sourceforge.net]) | 21 | AC_INIT([edje], [v_ver]-alpha, [enlightenment-devel@lists.sourceforge.net]) |
22 | AC_PREREQ([2.52]) | 22 | AC_PREREQ([2.52]) |
23 | AC_CONFIG_SRCDIR([configure.ac]) | 23 | AC_CONFIG_SRCDIR([configure.ac]) |
24 | AC_CONFIG_MACRO_DIR([m4]) | 24 | AC_CONFIG_MACRO_DIR([m4]) |
@@ -96,6 +96,8 @@ AC_ARG_ENABLE([amalgamation], | |||
96 | ) | 96 | ) |
97 | AM_CONDITIONAL([EDJE_AMALGAMATION], [test "x${do_amalgamation}" = "xyes"]) | 97 | AM_CONDITIONAL([EDJE_AMALGAMATION], [test "x${do_amalgamation}" = "xyes"]) |
98 | 98 | ||
99 | EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) | ||
100 | |||
99 | EFL_ENABLE_BIN([edje-cc]) | 101 | EFL_ENABLE_BIN([edje-cc]) |
100 | EFL_ENABLE_BIN([edje-decc]) | 102 | EFL_ENABLE_BIN([edje-decc]) |
101 | EFL_ENABLE_BIN([edje-recc]) | 103 | EFL_ENABLE_BIN([edje-recc]) |
@@ -256,37 +258,37 @@ fi | |||
256 | 258 | ||
257 | PKG_CHECK_MODULES([MINIMAL], | 259 | PKG_CHECK_MODULES([MINIMAL], |
258 | [ | 260 | [ |
259 | eina >= 1.1.0 | 261 | eina >= 1.2.0 |
260 | eet >= 1.5.0 | 262 | eet >= 1.6.0 |
261 | ]) | 263 | ]) |
262 | 264 | ||
263 | PKG_CHECK_MODULES([EDJE], | 265 | PKG_CHECK_MODULES([EDJE], |
264 | [ | 266 | [ |
265 | eina >= 1.1.0 | 267 | eina >= 1.2.0 |
266 | eet >= 1.5.0 | 268 | eet >= 1.6.0 |
267 | evas >= 1.1.0 | 269 | evas >= 1.2.0 |
268 | ecore >= 1.1.0 | 270 | ecore >= 1.2.0 |
269 | ecore-evas >= 1.1.0 | 271 | ecore-evas >= 1.2.0 |
270 | ecore-file >= 1.1.0 | 272 | ecore-file >= 1.2.0 |
271 | embryo >= 1.1.0 | 273 | embryo >= 1.2.0 |
272 | ]) | 274 | ]) |
273 | 275 | ||
274 | EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}" | 276 | EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}" |
275 | EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}" | 277 | EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}" |
276 | 278 | ||
277 | requirement_edje="embryo >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0 ${requirement_edje}" | 279 | requirement_edje="embryo >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0 ${requirement_edje}" |
278 | requirement_edje="${requirement_lua} ${requirement_edje}" | 280 | requirement_edje="${requirement_lua} ${requirement_edje}" |
279 | 281 | ||
280 | have_ecore_imf="no" | 282 | have_ecore_imf="no" |
281 | PKG_CHECK_MODULES([ECORE_IMF], | 283 | PKG_CHECK_MODULES([ECORE_IMF], |
282 | [ | 284 | [ |
283 | ecore-imf >= 1.1.0 | 285 | ecore-imf >= 1.2.0 |
284 | ecore-imf-evas >= 1.1.0 | 286 | ecore-imf-evas >= 1.2.0 |
285 | ], | 287 | ], |
286 | [ | 288 | [ |
287 | AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support for Edje Entry]) | 289 | AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support for Edje Entry]) |
288 | have_ecore_imf="yes" | 290 | have_ecore_imf="yes" |
289 | requirement_edje="ecore-imf-evas >= 1.1.0 ecore-imf >= 1.1.0 ${requirement_edje}" | 291 | requirement_edje="ecore-imf-evas >= 1.2.0 ecore-imf >= 1.2.0 ${requirement_edje}" |
290 | ], | 292 | ], |
291 | [have_ecore_imf="no"]) | 293 | [have_ecore_imf="no"]) |
292 | 294 | ||
@@ -443,26 +445,26 @@ fi | |||
443 | # Dependencies for the binaries | 445 | # Dependencies for the binaries |
444 | 446 | ||
445 | if test "x$have_edje_cc" = "xyes"; then | 447 | if test "x$have_edje_cc" = "xyes"; then |
446 | PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0]) | 448 | PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0]) |
447 | EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}" | 449 | EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}" |
448 | fi | 450 | fi |
449 | 451 | ||
450 | AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"]) | 452 | AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"]) |
451 | 453 | ||
452 | if test "x$have_edje_decc" = "xyes"; then | 454 | if test "x$have_edje_decc" = "xyes"; then |
453 | PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0]) | 455 | PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0]) |
454 | fi | 456 | fi |
455 | 457 | ||
456 | if test "x$have_edje_player" = "xyes"; then | 458 | if test "x$have_edje_player" = "xyes"; then |
457 | PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0]) | 459 | PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0]) |
458 | fi | 460 | fi |
459 | 461 | ||
460 | if test "x$have_edje_inspector" = "xyes"; then | 462 | if test "x$have_edje_inspector" = "xyes"; then |
461 | PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0]) | 463 | PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0]) |
462 | fi | 464 | fi |
463 | 465 | ||
464 | if test "x$have_edje_external_inspector" = "xyes"; then | 466 | if test "x$have_edje_external_inspector" = "xyes"; then |
465 | PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], [ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0]) | 467 | PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], [ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0]) |
466 | fi | 468 | fi |
467 | 469 | ||
468 | 470 | ||
@@ -541,11 +543,6 @@ AC_ARG_ENABLE([build-examples], | |||
541 | [ | 543 | [ |
542 | if test "x${enableval}" = "xyes" ; then | 544 | if test "x${enableval}" = "xyes" ; then |
543 | build_examples="yes" | 545 | build_examples="yes" |
544 | edje_cc=$($PKG_CONFIG --variable=prefix edje)/bin/edje_cc | ||
545 | # put in here the dependencies for Edje' examples. They are | ||
546 | # meant to be 'real world' usage examples, thus one will be | ||
547 | # using higher level libraries on these programs | ||
548 | AC_SUBST(edje_cc) | ||
549 | else | 546 | else |
550 | build_examples="no" | 547 | build_examples="no" |
551 | fi | 548 | fi |