diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac
index 21d555c6a2..db96b45397 100644
--- a/legacy/eina/configure.ac
+++ b/legacy/eina/configure.ac
@@ -377,12 +377,12 @@ AC_SUBST(fnmatch_libs)
 
 ### Modules
 
-EINA_CHECK_MODULE([chained-pool], [yes], [chained pool])
-EINA_CHECK_MODULE([ememoa-fixed], [${enable_ememoa}], [ememoa fixed])
+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], [yes], [fixed bitmap])
-EINA_CHECK_MODULE([pass-through], [yes], [pass through])
-EINA_CHECK_MODULE([buddy], [yes], [buddy])
+EINA_CHECK_MODULE([fixed-bitmap],   [no],               [fixed bitmap])
+EINA_CHECK_MODULE([pass-through],   [no],               [pass through])
+EINA_CHECK_MODULE([buddy],          [no],               [buddy])
 
 
 ### Make the debug preprocessor configurable
diff --git a/legacy/eina/m4/eina_check.m4 b/legacy/eina/m4/eina_check.m4
index 6889c9df03..6a335b927e 100644
--- a/legacy/eina/m4/eina_check.m4
+++ b/legacy/eina/m4/eina_check.m4
@@ -4,10 +4,8 @@ AC_DEFUN([EINA_CHECK_MODULE],
 m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
 m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
 
-want_module="$2"
-
 AC_ARG_ENABLE([mempool-$1],
-   [AC_HELP_STRING([--enable-mempool-$1], [enable build of $3 @<:@default=yes@:>@])],
+   [AC_HELP_STRING([--enable-mempool-$1], [enable build of $3 @<:@default=$2@:>@])],
    [
     if test "x${enableval}" = "xyes" ; then
        enable_module="yes"
@@ -19,7 +17,7 @@ AC_ARG_ENABLE([mempool-$1],
        fi
     fi
    ],
-   [enable_module="yes"])
+   [enable_module=$2])
 
 have_module="no"
 if test "x${enable_module}" = "xyes" || test "x${enable_module}" = "xstatic" ; then
@@ -29,31 +27,17 @@ fi
 AC_MSG_CHECKING([whether to enable $3 built])
 AC_MSG_RESULT([${have_module}])
 
-build_module="no"
-if test "x${want_module}" = "xyes" && test "x${have_module}" = "xyes" ; then
-   build_module="yes"
-fi
-
-AC_MSG_CHECKING([whether to build $3])
-AC_MSG_RESULT([${build_module}])
-
 static_module="no"
-if test "x${want_module}" = "xyes" && test "x${enable_module}" = "xstatic" ; then
+if test "x${enable_module}" = "xstatic" ; then
    static_module="yes"
+   have_static_module="yes"
+   AC_DEFINE(EINA_STATIC_BUILD_[]UP, 1, [Set to 1 if $2 is statically built])
 fi
 
-AM_CONDITIONAL(EINA_BUILD_[]UP, [test "x${build_module}" = "xyes"])
+AM_CONDITIONAL(EINA_BUILD_[]UP, [test "x${have_module}" = "xyes"])
 AM_CONDITIONAL(EINA_STATIC_BUILD_[]UP, [test "x${static_module}" = "xyes"])
 
-if test "x${static_module}" = "xyes" ; then
-   AC_DEFINE(EINA_STATIC_BUILD_[]UP, 1, [Set to 1 if $2 is statically built])
-   have_static_module="yes"
-fi
-
-enable_[]DOWN="no"
-if test "x${want_module}" = "xyes" ; then
-   enable_[]DOWN=${enable_module}
-fi
+enable_[]DOWN=${enable_module}
 
 m4_popdef([UP])
 m4_popdef([DOWN])