summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2009-12-19 11:36:18 +0000
committerVincent Torri <vincent.torri@gmail.com>2009-12-19 11:36:18 +0000
commit9a29b1d15a66b70b1034faf813b854399378874f (patch)
treeb52050a51596c274f5f8359104c557312499db59 /legacy
parenta09ba710478b3427d27da23b1f7bb75d79f6b773 (diff)
fix autotools stuff wrt c-ares option
SVN revision: 44568
Diffstat (limited to 'legacy')
-rw-r--r--legacy/ecore/configure.ac11
-rw-r--r--legacy/ecore/m4/ecore_check_options.m419
2 files changed, 11 insertions, 19 deletions
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
820 820
821 ECORE_CHECK_CARES([${want_cares}], 821 ECORE_CHECK_CARES([${want_cares}],
822 [ 822 [
823 have_cares="yes" 823 have_cares="yes"
824 requirements_ecore_con="libcares ${requirements_ecore_con}" 824 requirements_ecore_con="libcares ${requirements_ecore_con}"
825 ], [ 825 ],
826 have_cares="no" 826 [have_cares="no"])
827 ])
828 827
829fi 828fi
830 829
830AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"])
831
831# ecore_ipc 832# ecore_ipc
832ECORE_CHECK_MODULE([Ipc], [${want_ecore_ipc}], [${have_ecore_con}], 833ECORE_CHECK_MODULE([Ipc], [${want_ecore_ipc}], [${have_ecore_con}],
833 [requirements_ecore_ipc="ecore-con ${requirements_ecore_ipc}"]) 834 [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
276dnl use: ECORE_CHECK_CARES(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) 276dnl use: ECORE_CHECK_CARES(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
277AC_DEFUN([ECORE_CHECK_CARES], 277AC_DEFUN([ECORE_CHECK_CARES],
278[ 278[
279_cares_requirement=""
280_ecore_want_cares=$1 279_ecore_want_cares=$1
281_ecore_have_cares="no" 280_ecore_have_cares="no"
282CARES_LIBS=""
283CARES_CFLAGS=""
284 281
285AC_ARG_ENABLE(cares, 282AC_ARG_ENABLE(cares,
286 [AC_HELP_STRING([--disable-cares], [disable cares support])], 283 [AC_HELP_STRING([--disable-cares], [disable cares support])],
@@ -294,19 +291,13 @@ AC_ARG_ENABLE(cares,
294 291
295if test "x${_ecore_want_cares}" = "xyes" -o "x${_ecore_want_cares}" = "xauto" ; then 292if test "x${_ecore_want_cares}" = "xyes" -o "x${_ecore_want_cares}" = "xauto" ; then
296 PKG_CHECK_MODULES([CARES], [libcares >= 1.6.1], 293 PKG_CHECK_MODULES([CARES], [libcares >= 1.6.1],
297 [ 294 [_ecore_have_cares="yes"],
298 AC_DEFINE(HAVE_CARES, 1, [Build Ecore_Con_Info with c-ares support]) 295 [_ecore_have_cares="no"])
299 _ecore_have_cares="yes"
300 _cares_requirement="libcares"
301 ], [
302 _ecore_have_cares="no"
303 ])
304fi 296fi
305 297
306AM_CONDITIONAL(HAVE_CARES, test "x$_ecore_have_cares" = "xyes") 298if test "x${_ecore_have_cares}" = "xyes" ; then
307 299 AC_DEFINE([HAVE_CARES], [1], [Build Ecore_Con_Info with c-ares support])
308AC_SUBST(CARES_LIBS) 300fi
309AC_SUBST(CARES_CFLAGS)
310 301
311if test "x$_ecore_have_cares" = "xyes" ; then 302if test "x$_ecore_have_cares" = "xyes" ; then
312 m4_default([$2], [:]) 303 m4_default([$2], [:])