merge: minor cleanup

SVN revision: 78340
This commit is contained in:
Vincent Torri 2012-10-22 20:07:04 +00:00
parent 69df3e14ec
commit 9bf9674cbc
1 changed files with 4 additions and 6 deletions

View File

@ -422,17 +422,14 @@ esac
# Valgrind # Valgrind
if test "x${want_valgrind}" = "xyes"; then if test "x${want_valgrind}" = "xyes" ; then
PKG_CHECK_MODULES([VALGRIND], [valgrind >= 2.4.0], PKG_CHECK_MODULES([VALGRIND], [valgrind >= 2.4.0],
[ [
have_valgrind="yes" have_valgrind="yes"
requirements_pc_eina="valgrind >= 2.4.0 ${requirements_pc_eina}" requirements_pc_eina="valgrind >= 2.4.0 ${requirements_pc_eina}"
requirements_pc_deps_eina="valgrind ${requirements_pc_deps_eina}" requirements_pc_deps_eina="valgrind ${requirements_pc_deps_eina}"
], ],
[ [AC_MSG_ERROR([Valgrind >= 2.4.0 is required])])
have_valgrind="no"
AC_MSG_ERROR([Valgrind >= 2.4.0 is required])
])
else else
AC_DEFINE([NVALGRIND], [1], [Valgrind support disabled]) AC_DEFINE([NVALGRIND], [1], [Valgrind support disabled])
fi fi
@ -513,7 +510,7 @@ fi
AC_MSG_CHECKING([wether to build Eina_Log infrastructure]) AC_MSG_CHECKING([wether to build Eina_Log infrastructure])
AC_MSG_RESULT([${enable_log}]) AC_MSG_RESULT([${enable_log}])
EINA_CONFIG(ENABLE_LOG, test "x${enable_log}" = "xyes") EINA_CONFIG([ENABLE_LOG], [test "x${enable_log}" = "xyes"])
EFL_CHECK_THREADS EFL_CHECK_THREADS
@ -522,6 +519,7 @@ EINA_CONFIG(HAVE_PTHREAD_AFFINITY, test "x${efl_have_setaffinity}" = "xyes")
EINA_CONFIG(HAVE_DEBUG_THREADS, test "$want_debug_threads" = "yes") EINA_CONFIG(HAVE_DEBUG_THREADS, test "$want_debug_threads" = "yes")
### Modules ### Modules
EINA_CHECK_MODULE([chained-pool], [static], [chained pool]) EINA_CHECK_MODULE([chained-pool], [static], [chained pool])
EINA_CHECK_MODULE([pass-through], [static], [pass through]) EINA_CHECK_MODULE([pass-through], [static], [pass through])
EINA_CHECK_MODULE([one-big], [static], [one big]) EINA_CHECK_MODULE([one-big], [static], [one big])