savio pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=3b12cf82ec436fea0ca0bc3f1918404dbfcb7e07

commit 3b12cf82ec436fea0ca0bc3f1918404dbfcb7e07
Author: Savio Sena <[email protected]>
Date:   Wed Sep 17 20:24:32 2014 -0300

    pkg-config: Brought latest "echo compatibility" changes from EFL to 
m4/efl.m4.
---
 m4/efl.m4 | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/m4/efl.m4 b/m4/efl.m4
index 5c75ab3..e6438a8 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=""

-- 


Reply via email to