summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-06 02:08:13 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-06 02:08:13 +0000
commiteb537609ba0de060c6633dc3e7dd9ba5e85c6d1b (patch)
treecb3d89826021f803594adeaf7e96699da371c33a /aclocal.m4
parent1f003810c22ca758bcf9c83b2f1f4755d74c47e1 (diff)
deal with aclocal(1)
This commit updates files so that aclocal.m4 generated by aclocal(1) works well with our configure.ac * ac_checking.m4: merged back to configure.ac because aclocal(1) cannot handle this macro. * ruby_append_options.m4: no longer used. * ruby_check_va_copy.m4: define using AC_DEFUN so that aclocal(1) can find this macro. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62243 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m42
1 files changed, 0 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 365f8de91a..1c4f42f171 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,7 +13,6 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_include([tool/m4/_colorize_result_prepare.m4])
-m4_include([tool/m4/ac_checking.m4])
m4_include([tool/m4/ac_msg_result.m4])
m4_include([tool/m4/colorize_result.m4])
m4_include([tool/m4/ruby_append_option.m4])
@@ -36,7 +35,6 @@ m4_include([tool/m4/ruby_dtrace_postprocess.m4])
m4_include([tool/m4/ruby_func_attribute.m4])
m4_include([tool/m4/ruby_mingw32.m4])
m4_include([tool/m4/ruby_prepend_option.m4])
-m4_include([tool/m4/ruby_prepend_options.m4])
m4_include([tool/m4/ruby_prog_gnu_ld.m4])
m4_include([tool/m4/ruby_replace_type.m4])
m4_include([tool/m4/ruby_rm_recursive.m4])