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 /tool | |
parent | 21d0b40de2897ac2e98104cb3d33cd374a4402ee (diff) |
Moved aclocal.m4 to macro directory
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3003
Diffstat (limited to 'tool')
-rw-r--r-- | tool/m4/aclocal.m4 | 47 | ||||
-rwxr-xr-x | tool/make-snapshot | 3 |
2 files changed, 49 insertions, 1 deletions
diff --git a/tool/m4/aclocal.m4 b/tool/m4/aclocal.m4 new file mode 100644 index 0000000000..2477ff45cd --- /dev/null +++ b/tool/m4/aclocal.m4 @@ -0,0 +1,47 @@ +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- + +# Copyright (C) 1996-2020 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +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_msg_result.m4]) +m4_include([tool/m4/colorize_result.m4]) +m4_include([tool/m4/ruby_append_option.m4]) +m4_include([tool/m4/ruby_append_options.m4]) +m4_include([tool/m4/ruby_check_builtin_func.m4]) +m4_include([tool/m4/ruby_check_builtin_setjmp.m4]) +m4_include([tool/m4/ruby_check_printf_prefix.m4]) +m4_include([tool/m4/ruby_check_setjmp.m4]) +m4_include([tool/m4/ruby_check_signedness.m4]) +m4_include([tool/m4/ruby_check_sizeof.m4]) +m4_include([tool/m4/ruby_check_sysconf.m4]) +m4_include([tool/m4/ruby_cppoutfile.m4]) +m4_include([tool/m4/ruby_decl_attribute.m4]) +m4_include([tool/m4/ruby_default_arch.m4]) +m4_include([tool/m4/ruby_define_if.m4]) +m4_include([tool/m4/ruby_defint.m4]) +m4_include([tool/m4/ruby_dtrace_available.m4]) +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_prog_gnu_ld.m4]) +m4_include([tool/m4/ruby_replace_funcs.m4]) +m4_include([tool/m4/ruby_replace_type.m4]) +m4_include([tool/m4/ruby_rm_recursive.m4]) +m4_include([tool/m4/ruby_setjmp_type.m4]) +m4_include([tool/m4/ruby_stack_grow_direction.m4]) +m4_include([tool/m4/ruby_try_cflags.m4]) +m4_include([tool/m4/ruby_try_ldflags.m4]) +m4_include([tool/m4/ruby_type_attribute.m4]) +m4_include([tool/m4/ruby_universal_arch.m4]) +m4_include([tool/m4/ruby_werror_flag.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") |