From e05a8537181988f5d4ffc2c30a018512721e9065 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 3 Jan 2016 03:12:20 +0000 Subject: acinclude.m4: rename * acinclude.m4: rename aclocal.m4, which should be generated by aclocal. [ruby-core:72675] [Bug #11941] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ Makefile.in | 4 ++++ acinclude.m4 | 46 ++++++++++++++++++++++++++++++++++++++++++++++ aclocal.m4 | 46 ---------------------------------------------- common.mk | 2 +- 5 files changed, 56 insertions(+), 47 deletions(-) create mode 100644 acinclude.m4 delete mode 100644 aclocal.m4 diff --git a/ChangeLog b/ChangeLog index 353f88fedb..1f9f17c68f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jan 3 12:12:09 2016 Nobuyoshi Nakada + + * acinclude.m4: rename aclocal.m4, which should be generated by + aclocal. [ruby-core:72675] [Bug #11941] + Sat Jan 2 21:07:55 2016 Eric Wong * thread_sync.c (queue_do_pop): avoid cast with Qfalse diff --git a/Makefile.in b/Makefile.in index f641ea1d77..e1c6a1cc12 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,6 +22,7 @@ LD = @LD@ YACC = bison PURIFY = AUTOCONF = autoconf +ACLOCAL = aclocal CONFIGURE = @CONFIGURE@ @SET_MAKE@ MKFILES = @MAKEFILES@ @@ -305,6 +306,9 @@ reconfig config.status: $(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \ $(srcdir)/$(CONFIGURE): $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F) +$(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4 + $(CHDIR) $(srcdir) && exec $(ACLOCAL) + incs: id.h all-incs: probes.h diff --git a/acinclude.m4 b/acinclude.m4 new file mode 100644 index 0000000000..99b24e6d93 --- /dev/null +++ b/acinclude.m4 @@ -0,0 +1,46 @@ +# -*- autoconf -*- + +AC_DEFUN([_COLORIZE_RESULT_PREPARE], [ + msg_checking= msg_result_yes= msg_result_no= msg_result_other= msg_reset= + 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$//']`" + msg_checking="${msg_begin}33m" + AS_IF([test ${TEST_COLORS:+set}], [ + msg_result_yes=[`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"`] + msg_result_no=[`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"`] + msg_result_other=[`expr ":$TEST_COLORS:" : ".*:skip=\([^:]*\):"`] + ]) + msg_result_yes="${msg_begin}${msg_result_yes:-32;1}m" + msg_result_no="${msg_begin}${msg_result_no:-31;1}m" + msg_result_other="${msg_begin}${msg_result_other:-33;1}m" + msg_reset="${msg_begin}m" + ]) + AS_UNSET(msg_begin) + ]) + 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}]")])]) +]) + +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}"])])], + [colorize_result "$1"]) dnl +]) + +AC_DEFUN([AC_CHECKING],[dnl +AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl +AS_MESSAGE([checking ${msg_checking}$1${msg_reset}...])]) + +AC_DEFUN([AC_MSG_RESULT], [dnl +{ _AS_ECHO_LOG([result: $1]) +COLORIZE_RESULT([$1]); dnl +}]) diff --git a/aclocal.m4 b/aclocal.m4 deleted file mode 100644 index 30fccd52fe..0000000000 --- a/aclocal.m4 +++ /dev/null @@ -1,46 +0,0 @@ -# -*- autoconf -*- - -AC_DEFUN([_COLORIZE_RESULT_PREPARE], [ - msg_checking= msg_result_yes= msg_result_no= msg_result_other= msg_reset= - 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$//']`" - msg_checking="${msg_begin}33m" - AS_IF([test ${TEST_COLORS:+set}], [ - msg_result_yes=[`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"`] - msg_result_no=[`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"`] - msg_result_other=[`expr ":$TEST_COLORS:" : ".*:skip=\([^:]*\):"`] - ]) - msg_result_yes="${msg_begin}${msg_result_yes:-32;1}m" - msg_result_no="${msg_begin}${msg_result_no:-31;1}m" - msg_result_other="${msg_begin}${msg_result_other:-33;1}m" - msg_reset="${msg_begin}m" - ]) - AS_UNSET(msg_begin) - ]) - 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}]")])]) -]) - -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}"])])], - [colorize_result "$1"]) dnl -]) - -AC_DEFUN([AC_CHECKING],[dnl -AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl -AS_MESSAGE([checking ${msg_checking}$1${msg_reset}...])]) - -AC_DEFUN([AC_MSG_RESULT], [dnl -{ _AS_ECHO_LOG([result: $1]) -COLORIZE_RESULT([$1]); dnl -}]) diff --git a/common.mk b/common.mk index 842a1c4ba9..79e9c224b9 100644 --- a/common.mk +++ b/common.mk @@ -520,7 +520,7 @@ realclean-local:: distclean-local $(Q)$(RM) id.c id.h probes.dmyh $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) parse.c parse.h lex.c enc/trans/newline.c $(PRELUDES) revision.h $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) id.c id.h probes.dmyh - $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) configure tool/config.guess tool/config.sub gems/*.gem + $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) configure aclocal.m4 tool/config.guess tool/config.sub gems/*.gem realclean-ext:: PHONY realclean-golf: distclean-golf $(Q)$(RM) $(GOLFPRELUDES) -- cgit v1.2.3