diff --git a/configure.ac b/configure.ac
index 3cbfccc882..f6597069a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -835,7 +835,7 @@ EFL_LIB_START([Eo])
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([EO] [evil])
+EFL_PLATFORM_DEPEND([EO], [evil])
 
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([EO], [eina])
@@ -2045,7 +2045,7 @@ EFL_LIB_START([Ecore_Ipc])
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([ECORE_IPC] [evil])
+EFL_PLATFORM_DEPEND([ECORE_IPC], [evil])
 
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore-con])
@@ -2084,7 +2084,7 @@ EFL_LIB_START([Ecore_File])
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([ECORE_FILE] [evil])
+EFL_PLATFORM_DEPEND([ECORE_FILE], [evil])
 
 ### Checks for libraries
 EFL_PLATFORM_DEPEND([ECORE_FILE], [escape])
@@ -2119,7 +2119,7 @@ EFL_LIB_START([Ecore_Input])
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([ECORE_INPUT] [evil])
+EFL_PLATFORM_DEPEND([ECORE_INPUT], [evil])
 
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [ecore])
@@ -2152,7 +2152,7 @@ EFL_LIB_START([Ecore_Input_Evas])
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([ECORE_INPUT_EVAS] [evil])
+EFL_PLATFORM_DEPEND([ECORE_INPUT_EVAS], [evil])
 
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore-input])
@@ -2418,7 +2418,7 @@ AC_ARG_ENABLE([pulseaudio],
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([ECORE_AUDIO] [evil])
+EFL_PLATFORM_DEPEND([ECORE_AUDIO], [evil])
 
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [ecore])
@@ -2779,7 +2779,7 @@ fi
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([ECORE_IMF] [evil])
+EFL_PLATFORM_DEPEND([ECORE_IMF], [evil])
 
 ### Checks for libraries
 EFL_PLATFORM_DEPEND([ECORE_IMF], [escape])
@@ -2868,7 +2868,7 @@ EFL_LIB_START([Ecore_Imf_Evas])
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([ECORE_IMF_EVAS] [evil])
+EFL_PLATFORM_DEPEND([ECORE_IMF_EVAS], [evil])
 
 ### Checks for libraries
 EFL_PLATFORM_DEPEND([ECORE_IMF_EVAS], [escape])
@@ -2916,7 +2916,7 @@ fi
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([ECORE_EVAS] [evil])
+EFL_PLATFORM_DEPEND([ECORE_EVAS], [evil])
 
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input-evas])
@@ -3063,7 +3063,7 @@ EFL_LIB_START([Eio])
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([EIO] [evil])
+EFL_PLATFORM_DEPEND([EIO], [evil])
 
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([EIO], [ecore])
@@ -3101,7 +3101,7 @@ EFL_LIB_START([EDBus])
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([EDBUS] [evil])
+EFL_PLATFORM_DEPEND([EDBUS], [evil])
 
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([EDBUS], [ecore])
@@ -3140,7 +3140,7 @@ AC_DEFINE([SLOPPY_SPEC], [1], [Sloppy Spec Compliance])
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([EFREET] [evil])
+EFL_PLATFORM_DEPEND([EFREET], [evil])
 
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([EFREET], [eet])
@@ -3432,6 +3432,9 @@ EFL_LIB_END([Edje])
 #### Emotion
 EFL_LIB_START([Emotion])
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([Emotion], [evil])
+
 ### Default values
 if test "${efl_func_shm_open}" = "yes"; then
    want_emotion_generic="static"
@@ -3525,7 +3528,7 @@ EFL_LIB_START([Ethumb])
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([ETHUMB] [evil])
+EFL_PLATFORM_DEPEND([ETHUMB], [evil])
 
 ### Checks for libraries
 EFL_PLATFORM_DEPEND([EINA], [evil])
@@ -3569,7 +3572,7 @@ EFL_LIB_START([Ethumb_Client])
 ### Checks for programs
 
 ## Compatibility layers
-EFL_PLATFORM_DEPEND([ETHUMB_CLIENT] [evil])
+EFL_PLATFORM_DEPEND([ETHUMB_CLIENT], [evil])
 
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eina])