diff --git a/configure.ac b/configure.ac
index 63cf97c39b..907b80afa2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3319,7 +3319,9 @@ EFL_LIB_START([Edje])
 
 ### Default values
 want_multisense="no" # TODO: move to ecore_audio and enable
-want_edje_program_cache="no"
+
+# TODO: should we keep or remove these?
+want_edje_program_cache="yes"
 want_edje_calc_cache="yes"
 want_fixed_point="no"
 
@@ -3349,7 +3351,13 @@ EFL_ADD_LIBS([EDJE], [-lm])
 
 EFL_EVAL_PKGS([EDJE])
 
-AC_DEFINE([EDJE_PROGRAM_CACHE], [1], [Cache result of program glob matches - this uses up extra ram with the gain of faster program matching])
+AC_DEFINE_IF([EDJE_PROGRAM_CACHE], [test "${want_edje_program_cache}" = "yes"],
+   [1], [Cache result of program glob matches])
+AC_DEFINE_IF([EDJE_CALC_CACHE], [test "${want_edje_calc_cache}" = "yes"],
+   [1], [Cache result of calc glob matches])
+AC_DEFINE_IF([BUILD_EDJE_FP], [test "${want_fixed_point}" = "yes"],
+   [1], [Use Fixed Point instead of FPU])
+
 AM_CONDITIONAL([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"])
 AC_DEFINE_IF([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"],
   [1], [Use Multisense])