diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-29 13:21:17 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-29 13:21:17 +0000 |
commit | 3133a5c971f77531aa33887c1d180d5bfdde0c33 (patch) | |
tree | 1a2fa6a49314eec17a888841a6f7cb9caad2aab4 | |
parent | 5723d9fd347f4a3e309cfbae93979ae70577aa28 (diff) |
configure.ac
* configure.ac: renamed configure.in. [Feature #13946]
* Makefile.in, common.mk, ext/rbconfig/sizeof/depend: use
configure.ac.
* README.ja.md, README.md: update document for configure.ac.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | README.ja.md | 2 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | aclocal.m4 | 4 | ||||
-rw-r--r-- | common.mk | 2 | ||||
-rw-r--r-- | configure.ac (renamed from configure.in) | 0 | ||||
-rw-r--r-- | ext/rbconfig/sizeof/depend | 4 | ||||
-rw-r--r-- | sparc.c | 2 | ||||
-rw-r--r-- | tool/install-sh | 6 |
9 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in index 4552d53306..7880fee798 100644 --- a/Makefile.in +++ b/Makefile.in @@ -315,7 +315,7 @@ reconfig config.status: $(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \ @PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \ set $(SHELL) $($@-args); $(reconfig-exec-$(V)) -$(srcdir)/$(CONFIGURE): $(srcdir)/configure.in $(srcdir)/aclocal.m4 +$(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac $(srcdir)/aclocal.m4 $(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F) $(srcdir)/aclocal.m4: diff --git a/README.ja.md b/README.ja.md index 953f949fa2..2902216f99 100644 --- a/README.ja.md +++ b/README.ja.md @@ -78,7 +78,7 @@ Ruby拡張モジュールについて話し合うruby-extメーリングリス� 以下の手順で行ってください. -1. もし `configure` ファイルが見つからない,もしくは `configure.in` より古いようなら, `autoconf` を実行して +1. もし `configure` ファイルが見つからない,もしくは `configure.ac` より古いようなら, `autoconf` を実行して 新しく `configure` を生成する 2. `configure` を実行して `Makefile` などを生成する @@ -75,7 +75,7 @@ This is what you need to do to compile and install Ruby: 1. If you want to use Microsoft Visual C++ to compile ruby, read [win32/README.win32](win32/README.win32) instead of this document. -2. If `./configure` does not exist or is older than configure.in, run +2. If `./configure` does not exist or is older than `configure.ac`, run `autoconf` to (re)generate configure. 3. Run `./configure`, which will generate `config.h` and `Makefile`. diff --git a/aclocal.m4 b/aclocal.m4 index 56e944be8f..18ba297b05 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1008,7 +1008,7 @@ $(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. BASERUBY="$(BASERUBY)" $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ - $(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in + $(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.ac $(ECHO) generating $@ $(Q) $(CHDIR) $(@D) && \ sed '/AUTOGENERATED/q' depend | \ diff --git a/configure.in b/configure.ac index 9f1011dccb..9f1011dccb 100644 --- a/configure.in +++ b/configure.ac diff --git a/ext/rbconfig/sizeof/depend b/ext/rbconfig/sizeof/depend index cd6af3d58b..143cbb0ee5 100644 --- a/ext/rbconfig/sizeof/depend +++ b/ext/rbconfig/sizeof/depend @@ -6,11 +6,11 @@ limits.c: $(top_srcdir)/tool/generic_erb.rb $(top_srcdir)/template/limits.c.tmpl sizes.c: $(top_srcdir)/tool/generic_erb.rb \ $(top_srcdir)/template/sizes.c.tmpl \ - $(top_srcdir)/configure.in \ + $(top_srcdir)/configure.ac \ $(top_srcdir)/ext/rbconfig/sizeof/extconf.rb $(Q) $(RUBY) $(top_srcdir)/tool/generic_erb.rb --output=$@ \ $(top_srcdir)/template/sizes.c.tmpl \ - $(top_srcdir)/configure.in \ + $(top_srcdir)/configure.ac \ $(top_srcdir)/ext/rbconfig/sizeof/extconf.rb # AUTOGENERATED DEPENDENCIES START @@ -26,7 +26,7 @@ rb_sparc_flush_register_windows(void) __volatile__ #endif -/* This condition should be in sync with one in configure.in */ +/* This condition should be in sync with one in configure.ac */ #if defined(__sparcv9) || defined(__sparc_v9__) || defined(__arch64__) # ifdef __GNUC__ ("flushw" : : : "%o7") diff --git a/tool/install-sh b/tool/install-sh index af97fa6af1..11e502f56d 100644 --- a/tool/install-sh +++ b/tool/install-sh @@ -1,13 +1,13 @@ #!/bin/sh -# Just only for using AC_PROG_INSTALL in configure.in. +# Just only for using AC_PROG_INSTALL in configure.ac. # See autoconf.info for more detail. cat <<EOF >&2 -Ruby uses a BSD-compatible install(1) if possible. If not, Ruby +Ruby uses a BSD-compatible install(1) if possible. If not, Ruby provides its own install(1) alternative. -This script a place holder for AC_PROG_INSTALL in configure.in. +This script is a place holder for AC_PROG_INSTALL in configure.ac. Please report a bug in Ruby to http://bugs.ruby-lang.org if you see this message. |