summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorSavio Sena <savio@expertisesolutions.com.br>2014-09-17 20:24:32 -0300
committerSavio Sena <savio@expertisesolutions.com.br>2014-09-17 20:28:06 -0300
commit3b12cf82ec436fea0ca0bc3f1918404dbfcb7e07 (patch)
tree70b6dd31e6c8fa7ffd1994d05faf5153b1d3da5d /m4
parent7cbef5890d6eab0e047f339e9f34ae0ff4ae0c77 (diff)
downloadelementary-3b12cf82ec436fea0ca0bc3f1918404dbfcb7e07.tar.gz
pkg-config: Brought latest "echo compatibility" changes from EFL to m4/efl.m4.
Diffstat (limited to 'm4')
-rw-r--r--m4/efl.m422
1 files changed, 12 insertions, 10 deletions
diff --git a/m4/efl.m4 b/m4/efl.m4
index 5c75ab3a8..e6438a888 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -57,18 +57,20 @@ case "$TERM" in
;;
esac
-if test "${want_color}" = "yes"; then
- if test `echo -e x` = x; then
- echoopt=-e
- else
- echoopt=
- fi
+### echo compatibility
- 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"`
+## the BSD echo does not have the -e option (it is the default behaviour)
+echo_e=
+if test "`echo -e x`" = "x"; then
+ echo_e=-e
+fi
+AC_SUBST([ECHO_E], [${echo_e}])
+if test "${want_color}" = "yes"; then
+ COLOR_YES=`echo $echo_e "\033@<:@1;32m"`
+ COLOR_NO=`echo $echo_e "\033@<:@1;31m"`
+ COLOR_OTHER=`echo $echo_e "\033@<:@1;36m"`
+ COLOR_RESET=`echo $echo_e "\033@<:@0m"`
else
COLOR_YES=""
COLOR_NO=""