diff --git a/m4/efl.m4 b/m4/efl.m4
index c02138bc77..4938d45cd2 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -153,7 +153,7 @@ dnl EFL_DEPEND_PKG(EFL, NAME, PACKAGE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 dnl Adds a pkg-config dependency to an efl, AC_DEFINE() HAVE_NAME,
 dnl and inserts dependencies in proper variables
 AC_DEFUN([EFL_DEPEND_PKG],
-[
+[dnl
 m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
 m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
 m4_pushdef([UPNAME], m4_translit([$2], [-a-z], [_A-Z]))dnl
@@ -179,15 +179,14 @@ m4_popdef([UPEFL])
 
 dnl EFL_OPTIONAL_DEPEND_PKG(EFL, VARIABLE, NAME, PACKAGE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 AC_DEFUN([EFL_OPTIONAL_DEPEND_PKG],
-[
+[dnl
 m4_pushdef([DOWN], m4_translit([$3], [-A-Z], [_a-z]))dnl
 
    have_[]m4_defn([DOWN])="no"
    if test "x$2" = "xyes"; then
       EFL_DEPEND_PKG([$1], [$3], [$4], [$5], [$6])
    fi
-
-m4_popdef([DOWN])
+m4_popdef([DOWN])dnl
 ])
 
 dnl EFL_OPTIONAL_INTERNAL_DEPEND_PKG(EFL, VARIABLE, NAME)
@@ -274,7 +273,7 @@ dnl     requirements_internal_deps_libs_pkg: external libraries that are public
 dnl             dependencies (due internal libs).
 dnl
 AC_DEFUN([EFL_LIB_START],
-[
+[dnl
 m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
 m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
 
@@ -293,27 +292,25 @@ USE_[]m4_defn([UP])_INTERNAL_LIBS="${USE_[]m4_defn([UP])_INTERNAL_LIBS}"
 m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS}"
 m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS}"
 
-AC_SUBST([requirements_libs_]m4_defn([DOWN]))
-AC_SUBST([requirements_public_libs_]m4_defn([DOWN]))
-AC_SUBST([requirements_cflags_]m4_defn([DOWN]))
-AC_SUBST([requirements_pc_]m4_defn([DOWN]))
-AC_SUBST(m4_defn([UP])[_LIBS])
-AC_SUBST(m4_defn([UP])[_INTERNAL_LIBS])
-AC_SUBST([USE_]m4_defn([UP])[_LIBS])
-AC_SUBST([USE_]m4_defn([UP])[_INTERNAL_LIBS])
-AC_SUBST(m4_defn([UP])[_LDFLAGS])
-AC_SUBST(m4_defn([UP])[_CFLAGS])
-
-AC_MSG_NOTICE([Start $1 checks])
-
-m4_popdef([UP])
-m4_popdef([DOWN])
+AC_SUBST([requirements_libs_]m4_defn([DOWN]))dnl
+AC_SUBST([requirements_public_libs_]m4_defn([DOWN]))dnl
+AC_SUBST([requirements_cflags_]m4_defn([DOWN]))dnl
+AC_SUBST([requirements_pc_]m4_defn([DOWN]))dnl
+AC_SUBST(m4_defn([UP])[_LIBS])dnl
+AC_SUBST(m4_defn([UP])[_INTERNAL_LIBS])dnl
+AC_SUBST([USE_]m4_defn([UP])[_LIBS])dnl
+AC_SUBST([USE_]m4_defn([UP])[_INTERNAL_LIBS])dnl
+AC_SUBST(m4_defn([UP])[_LDFLAGS])dnl
+AC_SUBST(m4_defn([UP])[_CFLAGS])dnl
+AC_MSG_NOTICE([Start $1 checks])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
 ])
 
 dnl EFL_LIB_END(PKG)
 dnl finishes the setup of an EFL library
 AC_DEFUN([EFL_LIB_END],
-[
+[dnl
 m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
 m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
 
@@ -334,16 +331,16 @@ m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS} ${EFL_CFLAGS} -I\$(top_srcdir)/src
 requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}"
 requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}"
 
-AC_MSG_NOTICE([Finished $1 checks])
-m4_popdef([UP])
-m4_popdef([DOWN])
+AC_MSG_NOTICE([Finished $1 checks])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
 ])
 
 dnl EFL_LIB_START_OPTIONAL(PKG, TEST)
 dnl test if library should be build and then EFL_LIB_START()
 dnl must call EFL_LIB_END_OPTIONAL() to close it.
 AC_DEFUN([EFL_LIB_START_OPTIONAL],
-[
+[dnl
 m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
 m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
 
@@ -357,18 +354,16 @@ fi
 if test "$efl_lib_optional_[]m4_defn([DOWN])" = "yes"; then
    EFL_LIB_START([$1])
    AC_DEFINE([HAVE_]m4_defn([UP]), [1], [optional EFL $1 is enabled])
-
 dnl closed at EFL_LIB_END_OPTIONAL()
-
-m4_popdef([UP])
-m4_popdef([DOWN])
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
 ])
 
 dnl EFL_LIB_END_OPTIONAL(PKG)
 dnl closes block started by EFL_LIB_START_OPTIONAL() and then
 dnl defines AM_CONDITIONAL([HAVE_PKG]) and AC_DEFINE([HAVE_PKG])
 AC_DEFUN([EFL_LIB_END_OPTIONAL],
-[
+[dnl
 m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
 m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
 
@@ -376,8 +371,7 @@ dnl close if started at EFL_LIB_START_OPTIONAL()
    EFL_LIB_END([$1])
 fi
 
-AM_CONDITIONAL([HAVE_]m4_defn([UP]), [test "$efl_lib_optional_[]m4_defn([DOWN])" = "yes"])
-
-m4_popdef([UP])
-m4_popdef([DOWN])
+AM_CONDITIONAL([HAVE_]m4_defn([UP]), [test "$efl_lib_optional_[]m4_defn([DOWN])" = "yes"])dnl
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
 ])