From df275179bde5eef92b701789b99e88ae038cdae2 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sun, 5 Apr 2020 11:53:07 +0900
Subject: [PATCH] Revert "Moved aclocal.m4 to macro directory"

This reverts commit 4a6571dbc14ee4e88c12cd9931f7695077a3ee6e,
because chkbuild does not follow.
---
 .github/workflows/macos.yml      | 2 +-
 .github/workflows/mingw.yml      | 2 +-
 .github/workflows/mjit.yml       | 2 +-
 .github/workflows/ubuntu.yml     | 2 +-
 .gitignore                       | 1 -
 .travis.yml                      | 2 +-
 tool/m4/aclocal.m4 => aclocal.m4 | 0
 template/Makefile.in             | 8 ++++----
 tool/make-snapshot               | 3 +--
 9 files changed, 10 insertions(+), 12 deletions(-)
 rename tool/m4/aclocal.m4 => aclocal.m4 (100%)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index ff7e391490..5765c05e45 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 -I tool/m4
+      - run: autoconf
         working-directory: src
       - run: mkdir build
       - name: Run configure
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index 0efc08a49c..5cccb09d8f 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 -I tool/m4"
+          sh -c "autoreconf -fi"
 
       - name: configure
         working-directory: build
diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml
index dff58f81a3..08a659e3e2 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 -I tool/m4
+      - run: autoconf
         working-directory: src
       - run: mkdir build
       - name: Run configure
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 23a8827e67..c98d05c1d7 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 -I tool/m4
+      - run: autoconf
         working-directory: src
       - run: mkdir build
       - name: Run confiugre
diff --git a/.gitignore b/.gitignore
index 27f1a947fd..916c7aaf9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -216,7 +216,6 @@ 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 17f7be98f8..1bd1ce8885 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -460,7 +460,7 @@ matrix:
   fast_finish: true
 
 before_script:
-  - rm -fr .ext tool/m4/autom4te.cache
+  - rm -fr .ext autom4te.cache
   - |-
     [ -d ~/.downloaded-cache ] ||
     mkdir ~/.downloaded-cache
diff --git a/tool/m4/aclocal.m4 b/aclocal.m4
similarity index 100%
rename from tool/m4/aclocal.m4
rename to aclocal.m4
diff --git a/template/Makefile.in b/template/Makefile.in
index 51ee854de1..33ea093838 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 $(tooldir)/m4/aclocal.m4
-	$(CHDIR) $(srcdir) && exec $(AUTOCONF) -I tool/m4 -o $(@F)
+$(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac $(srcdir)/aclocal.m4
+	$(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
 
-$(tooldir)/m4/aclocal.m4:
+$(srcdir)/aclocal.m4:
 	$(CHDIR) $(srcdir) && \
-	type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL) --output=tool/m4/$(@F); \
+	type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL); \
 	touch $(@F)
 
 prereq: $(srcdir)/$(CONFIGURE)
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 901ec14ff4..79289d6bfb 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -407,14 +407,13 @@ def package(vcs, rev, destdir, tmp = nil)
     end
     unless File.exist?("configure")
       print "creating configure..."
-      unless system(ENV["AUTOCONF"], "-I", "tool/m4", "-o", "configure")
+      unless system([ENV["AUTOCONF"]]*2)
         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")