1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Honor --silent option

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-04-03 08:29:51 +00:00
parent e8b536c7e7
commit c3da162596
3 changed files with 10 additions and 8 deletions

View file

@ -35,7 +35,7 @@ AS_IF([test "$HAVE_BASERUBY" = yes -a "`RUBYOPT=- $BASERUBY -e 'print 42' 2>/dev
AS_IF([test "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42' 2>/dev/null`" = 42], [
BASERUBY="$BASERUBY --disable=gems"
])
$BASERUBY -C "$srcdir" tool/downloader.rb -d tool -e gnu config.guess config.sub
$BASERUBY -C "$srcdir" tool/downloader.rb -d tool -e gnu config.guess config.sub >&AS_MESSAGE_FD
], [
BASERUBY="echo executable host ruby is required. use --with-baseruby option.; false"
HAVE_BASERUBY=no
@ -3743,7 +3743,7 @@ guard=INCLUDE_RUBY_CONFIG_H
(
AS_IF([test "x$CONFIGURE_TTY" = xyes], [color=--color], [color=])
exec ${srcdir}/tool/ifchange $color "${config_h}" -
) || AC_MSG_ERROR([failed to create ${config_h}])
) >&AS_MESSAGE_FD || AC_MSG_ERROR([failed to create ${config_h}])
tr -d '\015' < largefile.h > confdefs.h
rm largefile.h
@ -3857,6 +3857,7 @@ AC_OUTPUT
}
}
AS_IF([test "$silent" = yes], [], [
AS_IF([${FOLD+:} false], [], [
AS_IF([test "`echo abcdefg hijklmno | fold -s -w10 | sed 1d`" = hijklmno], [FOLD="fold"], [FOLD=])
])
@ -3902,3 +3903,4 @@ config_summary "search path" "$search_path"
config_summary "static-linked-ext" ${EXTSTATIC:+"yes"}
echo ""
echo "---"
])

View file

@ -21,7 +21,7 @@ AC_DEFUN([_COLORIZE_RESULT_PREPARE], [
AS_REQUIRE_SHELL_FN([colorize_result],
[AS_FUNCTION_DESCRIBE([colorize_result], [MSG], [Colorize result])],
[AS_CASE(["$[]1"],
[yes], [AS_ECHO(["${msg_result_yes}$[]1${msg_reset}"])],
[no], [AS_ECHO(["${msg_result_no}$[]1${msg_reset}"])],
[AS_ECHO(["${msg_result_other}$[]1${msg_reset}"])])])
[yes], [_AS_ECHO([${msg_result_yes}$[]1${msg_reset}])],
[no], [_AS_ECHO([${msg_result_no}$[]1${msg_reset}])],
[_AS_ECHO([${msg_result_other}$[]1${msg_reset}])])])
])dnl

View file

@ -2,8 +2,8 @@
AC_DEFUN([COLORIZE_RESULT], [AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
AS_LITERAL_IF([$1],
[m4_case([$1],
[yes], [AS_ECHO(["${msg_result_yes}$1${msg_reset}"])],
[no], [AS_ECHO(["${msg_result_no}$1${msg_reset}"])],
[AS_ECHO(["${msg_result_other}$1${msg_reset}"])])],
[yes], [_AS_ECHO([${msg_result_yes}$1${msg_reset}])],
[no], [_AS_ECHO([${msg_result_no}$1${msg_reset}])],
[_AS_ECHO([${msg_result_other}$1${msg_reset}])])],
[colorize_result "$1"]) dnl
])dnl