diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index 222ce39d50..02c4d73738 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -820,14 +820,15 @@ if test "x${have_ecore_con}" = "xyes" ; then ECORE_CHECK_CARES([${want_cares}], [ - have_cares="yes" - requirements_ecore_con="libcares ${requirements_ecore_con}" - ], [ - have_cares="no" - ]) + have_cares="yes" + requirements_ecore_con="libcares ${requirements_ecore_con}" + ], + [have_cares="no"]) fi +AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"]) + # ecore_ipc ECORE_CHECK_MODULE([Ipc], [${want_ecore_ipc}], [${have_ecore_con}], [requirements_ecore_ipc="ecore-con ${requirements_ecore_ipc}"]) diff --git a/legacy/ecore/m4/ecore_check_options.m4 b/legacy/ecore/m4/ecore_check_options.m4 index e11ca43b73..c6db0bfd31 100644 --- a/legacy/ecore/m4/ecore_check_options.m4 +++ b/legacy/ecore/m4/ecore_check_options.m4 @@ -276,11 +276,8 @@ fi dnl use: ECORE_CHECK_CARES(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) AC_DEFUN([ECORE_CHECK_CARES], [ -_cares_requirement="" _ecore_want_cares=$1 _ecore_have_cares="no" -CARES_LIBS="" -CARES_CFLAGS="" AC_ARG_ENABLE(cares, [AC_HELP_STRING([--disable-cares], [disable cares support])], @@ -294,19 +291,13 @@ 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], - [ - AC_DEFINE(HAVE_CARES, 1, [Build Ecore_Con_Info with c-ares support]) - _ecore_have_cares="yes" - _cares_requirement="libcares" - ], [ - _ecore_have_cares="no" - ]) + [_ecore_have_cares="yes"], + [_ecore_have_cares="no"]) fi -AM_CONDITIONAL(HAVE_CARES, test "x$_ecore_have_cares" = "xyes") - -AC_SUBST(CARES_LIBS) -AC_SUBST(CARES_CFLAGS) +if test "x${_ecore_have_cares}" = "xyes" ; then + AC_DEFINE([HAVE_CARES], [1], [Build Ecore_Con_Info with c-ares support]) +fi if test "x$_ecore_have_cares" = "xyes" ; then m4_default([$2], [:])