From 36ef85219e91ba6dee0fbf4c2998db089b6adc90 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sun, 31 Jan 2010 14:52:16 +0000 Subject: [PATCH] if someone pass --enable-default-mempool, pass_through will be used in code, but not installed. So it that option is passed, chained_mempool is disabled, and pass_through is enabled and linked statically SVN revision: 45755 --- legacy/eina/configure.ac | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac index 75c8a6d9d1..b825df5e53 100644 --- a/legacy/eina/configure.ac +++ b/legacy/eina/configure.ac @@ -381,12 +381,23 @@ AC_SUBST(fnmatch_libs) ### Modules -EINA_CHECK_MODULE([chained-pool], [static], [chained pool]) -EINA_CHECK_MODULE([ememoa-fixed], [${enable_ememoa}], [ememoa fixed]) -EINA_CHECK_MODULE([ememoa-unknown], [${enable_ememoa}], [ememoa unknown]) -EINA_CHECK_MODULE([fixed-bitmap], [no], [fixed bitmap]) -EINA_CHECK_MODULE([pass-through], [no], [pass through]) -EINA_CHECK_MODULE([buddy], [no], [buddy]) +if test "x${have_default_mempool}" = "xyes" ; then + enable_chained_pool="no" + enable_pass_through="static" +else + enable_chained_pool="static" + enable_pass_through="no" +fi + +AC_MSG_WARN([cp : $enable_chained_pool]) +AC_MSG_WARN([pt : $enable_pass_through]) + +EINA_CHECK_MODULE([chained-pool], [${enable_chained_pool}], [chained pool]) +EINA_CHECK_MODULE([ememoa-fixed], [${enable_ememoa}], [ememoa fixed]) +EINA_CHECK_MODULE([ememoa-unknown], [${enable_ememoa}], [ememoa unknown]) +EINA_CHECK_MODULE([fixed-bitmap], [no], [fixed bitmap]) +EINA_CHECK_MODULE([pass-through], [${enable_pass_through}], [pass through]) +EINA_CHECK_MODULE([buddy], [no], [buddy]) ### Make the debug preprocessor configurable