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/ecore/m4 | |
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/ecore/m4/ecore_check_module.m4 | 6 | ||||
-rw-r--r-- | libraries/ecore/m4/ecore_check_options.m4 | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libraries/ecore/m4/ecore_check_module.m4 b/libraries/ecore/m4/ecore_check_module.m4 index 658b42e..01c4e0e 100644 --- a/libraries/ecore/m4/ecore_check_module.m4 +++ b/libraries/ecore/m4/ecore_check_module.m4 | |||
@@ -73,9 +73,9 @@ AC_ARG_ENABLE(ecore-evas-$1, | |||
73 | AC_MSG_CHECKING([whether ecore_evas $4 support is to be built]) | 73 | AC_MSG_CHECKING([whether ecore_evas $4 support is to be built]) |
74 | AC_MSG_RESULT([${want_module}]) | 74 | AC_MSG_RESULT([${want_module}]) |
75 | 75 | ||
76 | if test "x$5" = "xyes" -a \ | 76 | if test "x$5" = "xyes" && \ |
77 | "x$have_ecore_evas" = "xyes" -a \ | 77 | test "x$have_ecore_evas" = "xyes" && \ |
78 | "x$want_module" = "xyes" ; then | 78 | test "x$want_module" = "xyes" ; then |
79 | PKG_CHECK_EXISTS([evas-$2], | 79 | PKG_CHECK_EXISTS([evas-$2], |
80 | [ | 80 | [ |
81 | AC_DEFINE([BUILD_ECORE_EVAS_]m4_defn([UP]), [1], [Support for $4 Engine in Ecore_Evas]) | 81 | AC_DEFINE([BUILD_ECORE_EVAS_]m4_defn([UP]), [1], [Support for $4 Engine in Ecore_Evas]) |
diff --git a/libraries/ecore/m4/ecore_check_options.m4 b/libraries/ecore/m4/ecore_check_options.m4 index 36792a1..fb7031a 100644 --- a/libraries/ecore/m4/ecore_check_options.m4 +++ b/libraries/ecore/m4/ecore_check_options.m4 | |||
@@ -314,7 +314,7 @@ AC_ARG_ENABLE(cares, | |||
314 | ]) | 314 | ]) |
315 | 315 | ||
316 | if test "x${_ecore_want_cares}" = "xyes" -o "x${_ecore_want_cares}" = "xauto" ; then | 316 | if test "x${_ecore_want_cares}" = "xyes" -o "x${_ecore_want_cares}" = "xauto" ; then |
317 | PKG_CHECK_MODULES([CARES], [libcares >= 1.6.1 libcares != 1.7.5], | 317 | PKG_CHECK_MODULES([CARES], [libcares >= 1.6.1], |
318 | [_ecore_have_cares="yes"], | 318 | [_ecore_have_cares="yes"], |
319 | [_ecore_have_cares="no"]) | 319 | [_ecore_have_cares="no"]) |
320 | fi | 320 | fi |