3 files changed, 15 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index d1d2d49512..f98ec62066 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 Makefile
 Makefile.in
 tags
+.DS_Store
 .deps
 .libs
 *.trs
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7c94bce163..c20d1677db 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -54,7 +54,7 @@ include images.mk
 
 all-local:
         @rm -f images.tmp; \
-        echo $(ECHO_N) 'EXTRA_DIST += ' > images.tmp; \
+        echo 'EXTRA_DIST += \\' > images.tmp; \
         (cd $(srcdir) && find ./img -type f -print | cut -d/ -f2- | grep -v '~' | sort | tr '\n' ' ') >> images.tmp && \
         echo >> images.tmp && \
         if ! cmp "$(srcdir)/images.mk" images.tmp >/dev/null; then \
diff --git a/m4/efl.m4 b/m4/efl.m4
index 5cf6054266..7e277003c4 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -49,7 +49,7 @@ dnl     want_color: yes or no
 AC_DEFUN([EFL_COLOR],
 [dnl
 case "$TERM" in
-   xterm|xterm-color|Eterm|aterm|kterm|rxvt*|screen|gnome|interix)
+   xterm|xterm-color|xterm-256color|Eterm|aterm|kterm|rxvt*|screen|gnome|interix)
       want_color="${WANT_COLOR:-yes}"
       ;;
    *)
@@ -58,10 +58,17 @@ case "$TERM" in
 esac
 
 if test "${want_color}" = "yes"; then
-   COLOR_YES=`echo -e "\033@<:@1;32m"`
-   COLOR_NO=`echo -e "\033@<:@1;31m"`
-   COLOR_OTHER=`echo -e "\033@<:@1;36m"`
-   COLOR_RESET=`echo -e "\033@<:@0m"`
+   if test `echo -e` = -e; then
+      echoopt=
+   else
+      echoopt=-e
+   fi
+
+   COLOR_YES=`echo $echoopt "\033@<:@1;32m"`
+   COLOR_NO=`echo $echoopt "\033@<:@1;31m"`
+   COLOR_OTHER=`echo $echoopt "\033@<:@1;36m"`
+   COLOR_RESET=`echo $echoopt "\033@<:@0m"`
+
 else
    COLOR_YES=""
    COLOR_NO=""
@@ -358,7 +365,7 @@ m4_defn([UP])_LDFLAGS="${EFL_COV_LDFLAGS} ${EFL_LDFLAGS} ${m4_defn([UP])_LDFLAGS
 m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFL_COV_LIBS} ${EFL_LIBS} ${m4_defn([UP])_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])} ${requirements_internal_deps_libs_[]m4_defn([DOWN])} ${requirements_public_libs_[]m4_defn([DOWN])} ${requirements_libs_[]m4_defn([DOWN])} ${requirements_libs_efl} "
 m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
 USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
-USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la ${requirements_internal_deps_libs_[]m4_defn([DOWN])}"
+USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la"
 m4_defn([UP])_CFLAGS="${EFL_COV_CFLAGS} ${EFL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_efl} -DEFL_[]m4_defn([UP])_BUILD=1"
 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}"