enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

fix autotools stuff wrt c-ares option 

SVN revision: 44568
This commit is contained in:
Vincent Torri 2009-12-19 11:36:18 +00:00
parent a09ba71047
commit 9a29b1d15a
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
legacy/ecore/configure.ac
View File

@ -820,14 +820,15 @@ if test "x${have_ecore_con}" = "xyes" ; then
ECORE_CHECK_CARES([${want_cares}], ECORE_CHECK_CARES([${want_cares}],
[ [
have_cares="yes" have_cares="yes"
requirements_ecore_con="libcares ${requirements_ecore_con}" requirements_ecore_con="libcares ${requirements_ecore_con}"
], [ ],
have_cares="no" [have_cares="no"])
])
fi fi
AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"])
# ecore_ipc # ecore_ipc
ECORE_CHECK_MODULE([Ipc], [${want_ecore_ipc}], [${have_ecore_con}], ECORE_CHECK_MODULE([Ipc], [${want_ecore_ipc}], [${have_ecore_con}],
[requirements_ecore_ipc="ecore-con ${requirements_ecore_ipc}"]) [requirements_ecore_ipc="ecore-con ${requirements_ecore_ipc}"])

19
legacy/ecore/m4/ecore_check_options.m4
View File

@ -276,11 +276,8 @@ fi
dnl use: ECORE_CHECK_CARES(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) dnl use: ECORE_CHECK_CARES(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
AC_DEFUN([ECORE_CHECK_CARES], AC_DEFUN([ECORE_CHECK_CARES],
[ [
_cares_requirement=""
_ecore_want_cares=$1 _ecore_want_cares=$1
_ecore_have_cares="no" _ecore_have_cares="no"
CARES_LIBS=""
CARES_CFLAGS=""
AC_ARG_ENABLE(cares, AC_ARG_ENABLE(cares,
[AC_HELP_STRING([--disable-cares], [disable cares support])], [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 if test "x${_ecore_want_cares}" = "xyes" -o "x${_ecore_want_cares}" = "xauto" ; then
PKG_CHECK_MODULES([CARES], [libcares >= 1.6.1], PKG_CHECK_MODULES([CARES], [libcares >= 1.6.1],
[ [_ecore_have_cares="yes"],
AC_DEFINE(HAVE_CARES, 1, [Build Ecore_Con_Info with c-ares support]) [_ecore_have_cares="no"])
_ecore_have_cares="yes"
_cares_requirement="libcares"
], [
_ecore_have_cares="no"
])
fi fi
AM_CONDITIONAL(HAVE_CARES, test "x$_ecore_have_cares" = "xyes") if test "x${_ecore_have_cares}" = "xyes" ; then
AC_DEFINE([HAVE_CARES], [1], [Build Ecore_Con_Info with c-ares support])
AC_SUBST(CARES_LIBS) fi
AC_SUBST(CARES_CFLAGS)
if test "x$_ecore_have_cares" = "xyes" ; then if test "x$_ecore_have_cares" = "xyes" ; then
m4_default([$2], [:]) m4_default([$2], [:])