NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jean Guyomarc'h 2013-11-16 09:43:23 +09:00 committed by Carsten Haitzler (Rasterman)
parent d606437f65
commit f126afbba2
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -15,6 +15,7 @@
Makefile Makefile
Makefile.in Makefile.in
tags tags
.DS_Store
.deps .deps
.libs .libs
*.trs *.trs

2
doc/Makefile.am
View File

@ -54,7 +54,7 @@ include images.mk
all-local: all-local:
@rm -f images.tmp; \ @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 && \ (cd $(srcdir) && find ./img -type f -print | cut -d/ -f2- | grep -v '~' | sort | tr '\n' ' ') >> images.tmp && \
echo >> images.tmp && \ echo >> images.tmp && \
if ! cmp "$(srcdir)/images.mk" images.tmp >/dev/null; then \ if ! cmp "$(srcdir)/images.mk" images.tmp >/dev/null; then \

19
m4/efl.m4
View File

@ -49,7 +49,7 @@ dnl want_color: yes or no
AC_DEFUN([EFL_COLOR], AC_DEFUN([EFL_COLOR],
[dnl [dnl
case "$TERM" in 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}" want_color="${WANT_COLOR:-yes}"
;; ;;
*) *)
@ -58,10 +58,17 @@ case "$TERM" in
esac esac
if test "${want_color}" = "yes"; then if test "${want_color}" = "yes"; then
COLOR_YES=`echo -e "\033@<:@1;32m"` if test `echo -e` = -e; then
COLOR_NO=`echo -e "\033@<:@1;31m"` echoopt=
COLOR_OTHER=`echo -e "\033@<:@1;36m"` else
COLOR_RESET=`echo -e "\033@<:@0m"` 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 else
COLOR_YES="" COLOR_YES=""
COLOR_NO="" 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])_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])}" 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])_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" 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_[]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}" requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}"