From c963d75dfdeec11f82e79e727062fbf89afa2c04 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 22 Apr 2012 09:19:23 +1000
Subject: Update EFL to latest beta.

---
 libraries/ecore/m4/ecore_check_module.m4  | 6 +++---
 libraries/ecore/m4/ecore_check_options.m4 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'libraries/ecore/m4')

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,
 AC_MSG_CHECKING([whether ecore_evas $4 support is to be built])
 AC_MSG_RESULT([${want_module}])
 
-if test "x$5" = "xyes" -a \
-        "x$have_ecore_evas" = "xyes" -a \
-        "x$want_module" = "xyes" ; then
+if test "x$5" = "xyes" && \
+   test "x$have_ecore_evas" = "xyes" && \
+   test "x$want_module" = "xyes" ; then
    PKG_CHECK_EXISTS([evas-$2],
       [
        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,
   ])
 
 if test "x${_ecore_want_cares}" = "xyes" -o "x${_ecore_want_cares}" = "xauto" ; then
-   PKG_CHECK_MODULES([CARES], [libcares >= 1.6.1 libcares != 1.7.5],
+   PKG_CHECK_MODULES([CARES], [libcares >= 1.6.1],
      [_ecore_have_cares="yes"],
      [_ecore_have_cares="no"])
 fi
-- 
cgit v1.1