diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-03 03:12:20 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-03 03:12:20 +0000 |
| commit | 15eb1ad02ed9342f4f47a14b7c2d7d1fe0853b06 (patch) | |
| tree | 5187951ed30f7ddfe46eb9bbf2b5e7830f4947a4 | |
| parent | 90d8f719d3c73e9ca1e00d36dc369369b8035bcd (diff) | |
| download | ruby-15eb1ad02ed9342f4f47a14b7c2d7d1fe0853b06.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | acinclude.m4 (renamed from aclocal.m4) | 2 | ||||
| -rw-r--r-- | common.mk | 2 |
4 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Jan 3 12:12:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <e@80x24.org> * 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/aclocal.m4 b/acinclude.m4 index 30fccd52fe..99b24e6d93 100644 --- a/aclocal.m4 +++ b/acinclude.m4 @@ -4,7 +4,7 @@ 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], + 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}], [ @@ -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) |