aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean.guyomarch@gmail.com>2013-11-16 09:43:23 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-11-16 09:43:23 +0900
commitf126afbba21af39c493f21424b653bb5c2e0d58f (patch)
tree536c472e9fc21e92ae06392c935bd140b75221d3 /m4
parentm4: remove saving of CFLAGS (diff)
downloadefl-f126afbba21af39c493f21424b653bb5c2e0d58f.tar.gz
Fix build issues on Mac OS X due to sh differences.
Summary: * efl.m4: add support for xterm-256color and fix display for the bsd echo. Fix autotools issue (present on Ubuntu also, but better handled). * doc/Makefile.am: bsd echo may not handle -n option in sh Reviewers: cedric CC: cedric, seoz Differential Revision: https://phab.enlightenment.org/D329
Diffstat (limited to 'm4')
-rw-r--r--m4/efl.m419
1 files changed, 13 insertions, 6 deletions
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}"