CVS update: php3

Date: Saturday September 12, 1998 @ 13:06 Author: zeev Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv19249 Modified Files: setup Log Message: Try to figure out how to run echo that supports \n and use it (fix for #605) Index: php3/setup diff -c php3/setup:1.42 php3/setup:1.43 *** php3/setup:1.42 Mon Aug 10 14:07:38 1998 --- php3/setup Sat Sep 12 13:06:58 1998 *************** *** 29,41 **** # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.42 1998/08/10 18:07:38 jah Exp $ if [ "$1" = "-q" ]; then quiet_mode=on shift fi if echo '\c' | grep -s c >/dev/null 2>&1 then ECHO_N="echo -n" --- 29,53 ---- # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.43 1998/09/12 17:06:58 zeev Exp $ if [ "$1" = "-q" ]; then quiet_mode=on shift fi + if [ echo -e "\n" | wc -l = 2 ]; then + # bash supports echo -e for handling escape sequences + ECHO_CMD="echo -e" + elif test -f /bin/echo; then + ECHO_CMD="/bin/echo" + elif test -f /usr/bin/echo; then + ECHO_CMD="/usr/bin/echo" + else + # fall back to the default echo - \n would most probably be displayed as-is + ECHO_CMD="echo" + fi + if echo '\c' | grep -s c >/dev/null 2>&1 then ECHO_N="echo -n" *************** *** 170,176 **** show_help() { echo '' ! ( eval "echo \$option_docstring_$1" ; if test "$2" = "yesnodir"; then set $3 echo "If you answer \yes', the default directory is \$2'." --- 182,188 ---- show_help() { echo '' ! ( eval "$ECHO_CMD \$option_docstring_$1" ; if test "$2" = "yesnodir"; then set $3 echo "If you answer \yes', the default directory is \$2'." -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net