From adfcc2112ef230d43978f0ad4f59c9d3997f9a4a Mon Sep 17 00:00:00 2001
From: Gustavo Sverzut Barbieri <barbieri@gmail.com>
Date: Wed, 10 Oct 2012 21:32:45 +0000
Subject: [PATCH] efl: cleanup unused conditional and always-enabled features.

SVN revision: 77817
---
 configure.ac                  |  9 ---------
 src/lib/eina/eina_config.h.in | 10 ++++------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0d888318fd..9d0fa93099 100644
--- a/configure.ac
+++ b/configure.ac
@@ -341,8 +341,6 @@ if test "x${have_safety_checks}" = "xyes" ; then
 fi
 AC_SUBST([EINA_CONFIGURE_SAFETY_CHECKS])
 
-AM_CONDITIONAL([SAFETY_CHECKS], [test "x$have_safety_checks" = "xyes"])
-
 if test -n "$with_max_log_level"; then
    AC_MSG_NOTICE([ignoring any EINA_LOG() with level greater than ${with_max_log_level}])
    AC_DEFINE_UNQUOTED([EINA_LOG_LEVEL_MAXIMUM], [${with_max_log_level}], [if set, logging is limited to this amount.])
@@ -352,10 +350,6 @@ if test "x${have_stringshare_usage}" = "xyes"; then
    AC_DEFINE([EINA_STRINGSHARE_USAGE], [1], [Report Eina stringshare usage pattern])
 fi
 
-# Choose best memory pool
-EINA_CONFIGURE_DEFAULT_MEMPOOL="#define EINA_DEFAULT_MEMPOOL"
-AC_SUBST([EINA_CONFIGURE_DEFAULT_MEMPOOL])
-
 ### Checks for programs
 
 ### Checks for libraries
@@ -530,9 +524,6 @@ AC_SUBST([EINA_CONFIGURE_ENABLE_LOG])
 
 EFL_CHECK_THREADS
 
-EINA_CONFIGURE_HAVE_THREADS="#define EINA_HAVE_THREADS"
-AC_SUBST(EINA_CONFIGURE_HAVE_THREADS)
-
 if test "$want_debug_threads" = "yes"; then
    EINA_CONFIGURE_HAVE_DEBUG_THREADS="#define EINA_HAVE_DEBUG_THREADS"
    AC_DEFINE([EFL_DEBUG_THREADS], [1], [Assert when forgot to call eina_threads_init])
diff --git a/src/lib/eina/eina_config.h.in b/src/lib/eina/eina_config.h.in
index 2b4913467d..8b3b3567a7 100644
--- a/src/lib/eina/eina_config.h.in
+++ b/src/lib/eina/eina_config.h.in
@@ -28,10 +28,9 @@
 #endif
 @EINA_CONFIGURE_MAGIC_DEBUG@
 
-#ifdef EINA_DEFAULT_MEMPOOL
-# undef EINA_DEFAULT_MEMPOOL
+#ifndef EINA_DEFAULT_MEMPOOL
+#define EINA_DEFAULT_MEMPOOL
 #endif
-@EINA_CONFIGURE_DEFAULT_MEMPOOL@
 
 #ifdef EINA_SAFETY_CHECKS
 # undef EINA_SAFETY_CHECKS
@@ -48,10 +47,9 @@
 #endif
 @EINA_CONFIGURE_HAVE_STDINT_H@
 
-#ifdef EINA_HAVE_THREADS
-# undef EINA_HAVE_THREADS
+#ifndef EINA_HAVE_THREADS
+#define EINA_HAVE_THREADS
 #endif
-@EINA_CONFIGURE_HAVE_THREADS@
 
 #ifdef EINA_HAVE_DEBUG_THREADS
 # undef EINA_HAVE_DEBUG_THREADS