summaryrefslogtreecommitdiff
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
parentd606437f65d3b22d91a0e94a5e1e74eaba459aec (diff)
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
-rw-r--r--.gitignore1
-rw-r--r--doc/Makefile.am2
-rw-r--r--m4/efl.m419
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 @@
15Makefile 15Makefile
16Makefile.in 16Makefile.in
17tags 17tags
18.DS_Store
18.deps 19.deps
19.libs 20.libs
20*.trs 21*.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
54 54
55all-local: 55all-local:
56 @rm -f images.tmp; \ 56 @rm -f images.tmp; \
57 echo $(ECHO_N) 'EXTRA_DIST += ' > images.tmp; \ 57 echo 'EXTRA_DIST += \\' > images.tmp; \
58 (cd $(srcdir) && find ./img -type f -print | cut -d/ -f2- | grep -v '~' | sort | tr '\n' ' ') >> images.tmp && \ 58 (cd $(srcdir) && find ./img -type f -print | cut -d/ -f2- | grep -v '~' | sort | tr '\n' ' ') >> images.tmp && \
59 echo >> images.tmp && \ 59 echo >> images.tmp && \
60 if ! cmp "$(srcdir)/images.mk" images.tmp >/dev/null; then \ 60 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
49AC_DEFUN([EFL_COLOR], 49AC_DEFUN([EFL_COLOR],
50[dnl 50[dnl
51case "$TERM" in 51case "$TERM" in
52 xterm|xterm-color|Eterm|aterm|kterm|rxvt*|screen|gnome|interix) 52 xterm|xterm-color|xterm-256color|Eterm|aterm|kterm|rxvt*|screen|gnome|interix)
53 want_color="${WANT_COLOR:-yes}" 53 want_color="${WANT_COLOR:-yes}"
54 ;; 54 ;;
55 *) 55 *)
@@ -58,10 +58,17 @@ case "$TERM" in
58esac 58esac
59 59
60if test "${want_color}" = "yes"; then 60if test "${want_color}" = "yes"; then
61 COLOR_YES=`echo -e "\033@<:@1;32m"` 61 if test `echo -e` = -e; then
62 COLOR_NO=`echo -e "\033@<:@1;31m"` 62 echoopt=
63 COLOR_OTHER=`echo -e "\033@<:@1;36m"` 63 else
64 COLOR_RESET=`echo -e "\033@<:@0m"` 64 echoopt=-e
65 fi
66
67 COLOR_YES=`echo $echoopt "\033@<:@1;32m"`
68 COLOR_NO=`echo $echoopt "\033@<:@1;31m"`
69 COLOR_OTHER=`echo $echoopt "\033@<:@1;36m"`
70 COLOR_RESET=`echo $echoopt "\033@<:@0m"`
71
65else 72else
66 COLOR_YES="" 73 COLOR_YES=""
67 COLOR_NO="" 74 COLOR_NO=""
@@ -358,7 +365,7 @@ m4_defn([UP])_LDFLAGS="${EFL_COV_LDFLAGS} ${EFL_LDFLAGS} ${m4_defn([UP])_LDFLAGS
358m4_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} " 365m4_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} "
359m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}" 366m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
360USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la" 367USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
361USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la ${requirements_internal_deps_libs_[]m4_defn([DOWN])}" 368USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la"
362m4_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" 369m4_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"
363requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}" 370requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}"
364requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}" 371requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}"