diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-04-05 04:30:04 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-04-05 09:26:57 +0900 |
commit | 4a6571dbc14ee4e88c12cd9931f7695077a3ee6e (patch) | |
tree | e45d37f47b478dc196c25d0c9e142d22896c0c8a | |
parent | 21d0b40de2897ac2e98104cb3d33cd374a4402ee (diff) | |
download | ruby-4a6571dbc14ee4e88c12cd9931f7695077a3ee6e.tar.gz |
Moved aclocal.m4 to macro directory
-rw-r--r-- | .github/workflows/macos.yml | 2 | ||||
-rw-r--r-- | .github/workflows/mingw.yml | 2 | ||||
-rw-r--r-- | .github/workflows/mjit.yml | 2 | ||||
-rw-r--r-- | .github/workflows/ubuntu.yml | 2 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | template/Makefile.in | 8 | ||||
-rw-r--r-- | tool/m4/aclocal.m4 (renamed from aclocal.m4) | 0 | ||||
-rwxr-xr-x | tool/make-snapshot | 3 |
9 files changed, 12 insertions, 10 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 5765c05e45..ff7e391490 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -35,7 +35,7 @@ jobs: - name: Set ENV run: | echo '::set-env name=JOBS::'-j$((1 + $(sysctl -n hw.activecpu))) - - run: autoconf + - run: autoconf -I tool/m4 working-directory: src - run: mkdir build - name: Run configure diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 5cccb09d8f..0efc08a49c 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -68,7 +68,7 @@ jobs: mkdir install mkdir temp cd src - sh -c "autoreconf -fi" + sh -c "autoreconf -fi -I tool/m4" - name: configure working-directory: build diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index 08a659e3e2..dff58f81a3 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -38,7 +38,7 @@ jobs: - name: Set ENV run: | echo '::set-env name=JOBS::'-j$((1 + $(nproc --all))) - - run: autoconf + - run: autoconf -I tool/m4 working-directory: src - run: mkdir build - name: Run configure diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index c98d05c1d7..23a8827e67 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -44,7 +44,7 @@ jobs: - name: Set ENV run: | echo '::set-env name=JOBS::'-j$((1 + $(nproc --all))) - - run: autoconf + - run: autoconf -I tool/m4 working-directory: src - run: mkdir build - name: Run confiugre diff --git a/.gitignore b/.gitignore index 916c7aaf9e..27f1a947fd 100644 --- a/.gitignore +++ b/.gitignore @@ -216,6 +216,7 @@ lcov*.info # /tool/ /tool/config.guess /tool/config.sub +/tool/m4/autom4te*.cache # /win32/ /win32/*.ico diff --git a/.travis.yml b/.travis.yml index 1bd1ce8885..17f7be98f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -460,7 +460,7 @@ matrix: fast_finish: true before_script: - - rm -fr .ext autom4te.cache + - rm -fr .ext tool/m4/autom4te.cache - |- [ -d ~/.downloaded-cache ] || mkdir ~/.downloaded-cache diff --git a/template/Makefile.in b/template/Makefile.in index 33ea093838..51ee854de1 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -366,12 +366,12 @@ reconfig config.status: $(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \ @PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \ set $(SHELL) $($@-args); $(reconfig-exec-$(V)) -$(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac $(srcdir)/aclocal.m4 - $(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F) +$(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac $(tooldir)/m4/aclocal.m4 + $(CHDIR) $(srcdir) && exec $(AUTOCONF) -I tool/m4 -o $(@F) -$(srcdir)/aclocal.m4: +$(tooldir)/m4/aclocal.m4: $(CHDIR) $(srcdir) && \ - type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL); \ + type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL) --output=tool/m4/$(@F); \ touch $(@F) prereq: $(srcdir)/$(CONFIGURE) diff --git a/aclocal.m4 b/tool/m4/aclocal.m4 index 2477ff45cd..2477ff45cd 100644 --- a/aclocal.m4 +++ b/tool/m4/aclocal.m4 diff --git a/tool/make-snapshot b/tool/make-snapshot index 79289d6bfb..901ec14ff4 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -407,13 +407,14 @@ def package(vcs, rev, destdir, tmp = nil) end unless File.exist?("configure") print "creating configure..." - unless system([ENV["AUTOCONF"]]*2) + unless system(ENV["AUTOCONF"], "-I", "tool/m4", "-o", "configure") puts $colorize.fail(" failed") return end puts $colorize.pass(" done") end clean.add("autom4te.cache") + clean.add("tool/m4/autom4te.cache") clean.add("enc/unicode/data") print "creating prerequisites..." if File.file?("common.mk") && /^prereq/ =~ commonmk = IO.read("common.mk") |