summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-21 07:16:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-21 07:16:33 +0000
commit5fe691934438438e33cde5890bc3b6696537e538 (patch)
tree8a1b7e6999bac49976ca0104742c5b0adeff5f26
parent21494036da1a8be67ba7119ec16613df942bf294 (diff)
Makefile.in: tty at reconfig
* aclocal.m4 (_COLORIZE_RESULT_PREPARE): force tty for reconfig. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52207 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--Makefile.in2
-rw-r--r--aclocal.m42
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 73f6da5..54f4a80 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -299,7 +299,7 @@ uncommon.mk: $(srcdir)/common.mk
.PHONY: reconfig
reconfig-args = $(srcdir)/$(CONFIGURE) $(configure_args)
config.status-args = ./config.status --recheck
-reconfig-exec-0 = exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3 3>&- 4>&-`
+reconfig-exec-0 = test -t 1 && tty=yes; exec 3>&1; exit `exec 4>&1; { CONFIGURE_TTY=$$tty "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3 3>&- 4>&-`
reconfig-exec-1 = set -x; "$$@"
reconfig config.status: $(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \
diff --git a/aclocal.m4 b/aclocal.m4
index faf6beb..30fccd5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2,7 +2,7 @@
AC_DEFUN([_COLORIZE_RESULT_PREPARE], [
msg_checking= msg_result_yes= msg_result_no= msg_result_other= msg_reset=
- AS_IF([test -t 1], [
+ AS_IF([test "x${CONFIGURE_TTY}" = xyes -o -t 1], [
msg_begin="`tput smso 2>/dev/null`"
AS_CASE(["$msg_begin"], ['@<:@'*m],
[msg_begin="`echo "$msg_begin" | sed ['s/[0-9]*m$//']`"