diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in
index 04fbf43dec..992e160b33 100644
--- a/legacy/ecore/configure.in
+++ b/legacy/ecore/configure.in
@@ -134,7 +134,7 @@ ecore_txt_libs="";
 AC_ARG_ENABLE(ecore-txt, 
   [  --disable-ecore-txt              disable the ecore_txt module],
   [
-    if [ test "$enableval" = "yes" ]; then  
+    if test x"$enableval" = x"yes" ; then  
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
@@ -240,7 +240,7 @@ if test "x$have_ecore_txt" = "xyes"; then
   AC_MSG_CHECKING(whether ecore_x module is to be built)
   AC_ARG_ENABLE(ecore-x, 
   [  --disable-ecore-x                disable the ecore_x module], [
-    if [ test "$enableval" = "yes" ]; then  
+    if test x"$enableval" = x"yes" ; then  
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
@@ -431,7 +431,7 @@ ecore_job_libs="";
 AC_ARG_ENABLE(ecore-job, 
   [  --disable-ecore-job              disable the ecore_job module],
   [
-    if [ test "$enableval" = "yes" ]; then  
+    if test x"$enableval" = x"yes" ; then  
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
@@ -464,7 +464,7 @@ AC_MSG_CHECKING(whether ecore_fb module is to be built)
 AC_ARG_ENABLE(ecore-fb, 
   [  --disable-ecore-fb               disable the ecore_fb module],
   [
-    if [ test "$enableval" = "yes" ]; then  
+    if test x"$enableval" = x"yes" ; then  
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
@@ -505,7 +505,7 @@ AC_MSG_CHECKING(whether ecore_evas module is to be built)
 AC_ARG_ENABLE(ecore-evas, 
   [  --disable-ecore-evas             disable the ecore_evas module],
   [
-    if [ test "$enableval" = "yes" ]; then  
+    if test x"$enableval" = x"yes" ; then  
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
@@ -541,7 +541,7 @@ AC_MSG_CHECKING(whether ecore_evas gl support is to be built)
 AC_ARG_ENABLE(ecore-evas-gl, 
   [  --disable-ecore-evas-gl          disable gl in the ecore_evas module],
   [
-    if [ test "$enableval" = "yes" ]; then  
+    if test x"$enableval" = x"yes" ; then  
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
@@ -583,7 +583,7 @@ AC_MSG_CHECKING(whether ecore_evas xrender support is to be built)
 AC_ARG_ENABLE(ecore-evas-xrender, 
   [  --disable-ecore-evas-xrender     disable xrender in the ecore_evas module],
   [
-    if [ test "$enableval" = "yes" ]; then  
+    if test x"$enableval" = x"yes" ; then  
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
@@ -625,7 +625,7 @@ AC_MSG_CHECKING(whether ecore_evas fb support is to be built)
 AC_ARG_ENABLE(ecore-evas-fb, 
   [  --disable-ecore-evas-fb          disable fb in the ecore_evas module],
   [
-    if [ test "$enableval" = "yes" ]; then  
+    if test x"$enableval" = x"yes" ; then  
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
@@ -659,7 +659,7 @@ AC_MSG_CHECKING(whether ecore_evas buffer support is to be built)
 AC_ARG_ENABLE(ecore-evas-buffer, 
   [  --disable-ecore-evas-buffer          disable buffer in the ecore_evas module],
   [
-    if [ test "$enableval" = "yes" ]; then  
+    if test x"$enableval" = x"yes" ; then  
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
@@ -697,7 +697,7 @@ ecore_con_libs="";
 AC_ARG_ENABLE(ecore-con, 
   [  --disable-ecore-con              disable the ecore_con module],
   [
-    if [ test "$enableval" = "yes" ]; then  
+    if test x"$enableval" = x"yes" ; then  
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
@@ -746,7 +746,7 @@ if test "x$have_ecore_con" = "xyes"; then
     AC_ARG_ENABLE(ecore-ipc, 
     [  --disable-ecore-ipc              disable the ecore_ipc module],
     [
-      if [ test "$enableval" = "yes" ]; then  
+      if test x"$enableval" = x"yes" ; then  
         AC_MSG_RESULT(yes)
       else
         AC_MSG_RESULT(no)
@@ -787,7 +787,7 @@ dbus_libs="";
 AC_ARG_ENABLE(ecore-dbus,
   [  --disable-ecore-dbus              disable the ecore_dbus module],
   [
-    if [ test "$enableval" = "yes" ]; then
+    if test x"$enableval" = x"yes" ; then
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
@@ -831,7 +831,7 @@ ecore_config_libs="";
 AC_ARG_ENABLE(ecore-config, 
   [  --disable-ecore-config              disable the ecore_config module],
   [
-    if [ test "$enableval" = "yes" ]; then  
+    if test x"$enableval" = x"yes" ; then  
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in
index 443f6bad9c..f954b651e9 100644
--- a/legacy/edje/configure.in
+++ b/legacy/edje/configure.in
@@ -102,7 +102,7 @@ fi
 AC_MSG_CHECKING(whether to build edje_cc)
 have_edje_cc="yes"
 AC_ARG_ENABLE(edje-cc, [  --disable-edje-cc       disable building of edje_cc ], [
-     if [ test "$enableval" = "yes" ]; then
+     if test x"$enableval" = x"yes" ; then
        AC_MSG_RESULT(yes)
        have_edje_cc="yes"
      else