From 0d86917bbe64e5dd3dbaba2c27a578e28b82a59a Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 27 Dec 2012 06:46:29 +0000 Subject: [PATCH] efl: when you remove option at least make the default sane or don't do it. SVN revision: 81731 --- configure.ac | 4 ++++ src/lib/eina/eina_config.h.in | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c455402977..f1713ffa70 100644 --- a/configure.ac +++ b/configure.ac @@ -838,6 +838,7 @@ case "${build_profile}" in want_valgrind="no" # TODO: "yes" is not working: relocation R_X86_64_32S against `vgPlain_interim_stack' can not be used when making a shared object; recompile with -fPIC want_debug_malloc="no" want_debug_threads="no" + want_pass_through="no" ;; debug) @@ -846,6 +847,7 @@ case "${build_profile}" in want_valgrind="no" # TODO: "yes" is not working: relocation R_X86_64_32S against `vgPlain_interim_stack' can not be used when making a shared object; recompile with -fPIC want_debug_malloc="yes" want_debug_threads="yes" + want_pass_through="yes" ;; release) @@ -854,11 +856,13 @@ case "${build_profile}" in want_valgrind="no" want_debug_malloc="no" want_debug_threads="no" + want_pass_through="no" ;; esac EINA_CONFIG([MAGIC_DEBUG], [test "x${have_magic_debug}" = "xyes"]) EINA_CONFIG([SAFETY_CHECKS], [test "x${have_safety_checks}" = "xyes"]) +EINA_CONFIG([DEFAULT_MEMPOOL], [test "x${want_pass_through}" = "xyes"]) if test -n "${with_max_log_level}"; then AC_MSG_NOTICE([ignoring any EINA_LOG() with level greater than ${with_max_log_level}]) diff --git a/src/lib/eina/eina_config.h.in b/src/lib/eina/eina_config.h.in index 979027062b..4c16565346 100644 --- a/src/lib/eina/eina_config.h.in +++ b/src/lib/eina/eina_config.h.in @@ -29,8 +29,9 @@ @EINA_CONFIGURE_MAGIC_DEBUG@ #ifndef EINA_DEFAULT_MEMPOOL -#define EINA_DEFAULT_MEMPOOL +# undef EINA_DEFAULT_MEMPOOL #endif +@EINA_CONFIGURE_DEFAULT_MEMPOOL@ #ifdef EINA_SAFETY_CHECKS # undef EINA_SAFETY_CHECKS