Skip to content

Commit f9e4378

Browse files
authored
get rid of aclocal (ruby#4280)
1 parent 83f9664 commit f9e4378

File tree

2 files changed

+34
-48
lines changed

2 files changed

+34
-48
lines changed

Diff for: aclocal.m4

-47
Original file line numberDiff line numberDiff line change
@@ -1,47 +0,0 @@
1-
# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
2-
3-
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
4-
5-
# This file is free software; the Free Software Foundation
6-
# gives unlimited permission to copy and/or distribute it,
7-
# with or without modifications, as long as this notice is preserved.
8-
9-
# This program is distributed in the hope that it will be useful,
10-
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
11-
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12-
# PARTICULAR PURPOSE.
13-
14-
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
15-
m4_include([tool/m4/_colorize_result_prepare.m4])
16-
m4_include([tool/m4/ac_msg_result.m4])
17-
m4_include([tool/m4/colorize_result.m4])
18-
m4_include([tool/m4/ruby_append_option.m4])
19-
m4_include([tool/m4/ruby_append_options.m4])
20-
m4_include([tool/m4/ruby_check_builtin_func.m4])
21-
m4_include([tool/m4/ruby_check_builtin_setjmp.m4])
22-
m4_include([tool/m4/ruby_check_printf_prefix.m4])
23-
m4_include([tool/m4/ruby_check_setjmp.m4])
24-
m4_include([tool/m4/ruby_check_signedness.m4])
25-
m4_include([tool/m4/ruby_check_sizeof.m4])
26-
m4_include([tool/m4/ruby_check_sysconf.m4])
27-
m4_include([tool/m4/ruby_cppoutfile.m4])
28-
m4_include([tool/m4/ruby_decl_attribute.m4])
29-
m4_include([tool/m4/ruby_default_arch.m4])
30-
m4_include([tool/m4/ruby_define_if.m4])
31-
m4_include([tool/m4/ruby_defint.m4])
32-
m4_include([tool/m4/ruby_dtrace_available.m4])
33-
m4_include([tool/m4/ruby_dtrace_postprocess.m4])
34-
m4_include([tool/m4/ruby_func_attribute.m4])
35-
m4_include([tool/m4/ruby_mingw32.m4])
36-
m4_include([tool/m4/ruby_prepend_option.m4])
37-
m4_include([tool/m4/ruby_prog_gnu_ld.m4])
38-
m4_include([tool/m4/ruby_replace_funcs.m4])
39-
m4_include([tool/m4/ruby_replace_type.m4])
40-
m4_include([tool/m4/ruby_rm_recursive.m4])
41-
m4_include([tool/m4/ruby_setjmp_type.m4])
42-
m4_include([tool/m4/ruby_stack_grow_direction.m4])
43-
m4_include([tool/m4/ruby_try_cflags.m4])
44-
m4_include([tool/m4/ruby_try_cxxflags.m4])
45-
m4_include([tool/m4/ruby_try_ldflags.m4])
46-
m4_include([tool/m4/ruby_universal_arch.m4])
47-
m4_include([tool/m4/ruby_werror_flag.m4])

Diff for: configure.ac

+34-1
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,47 @@ dnl Process this file with autoconf to produce a configure script.
22
AC_INIT
33
{
44
AC_CONFIG_AUX_DIR(tool)
5-
AC_CONFIG_MACRO_DIRS(tool/m4)
65

76
AC_PREREQ(2.67)
87

98
tooldir="$srcdir/tool"
109

1110
AC_DISABLE_OPTION_CHECKING
1211

12+
m4_include([tool/m4/_colorize_result_prepare.m4])
13+
m4_include([tool/m4/ac_msg_result.m4])
14+
m4_include([tool/m4/colorize_result.m4])
15+
m4_include([tool/m4/ruby_append_option.m4])
16+
m4_include([tool/m4/ruby_append_options.m4])
17+
m4_include([tool/m4/ruby_check_builtin_func.m4])
18+
m4_include([tool/m4/ruby_check_builtin_setjmp.m4])
19+
m4_include([tool/m4/ruby_check_printf_prefix.m4])
20+
m4_include([tool/m4/ruby_check_setjmp.m4])
21+
m4_include([tool/m4/ruby_check_signedness.m4])
22+
m4_include([tool/m4/ruby_check_sizeof.m4])
23+
m4_include([tool/m4/ruby_check_sysconf.m4])
24+
m4_include([tool/m4/ruby_cppoutfile.m4])
25+
m4_include([tool/m4/ruby_decl_attribute.m4])
26+
m4_include([tool/m4/ruby_default_arch.m4])
27+
m4_include([tool/m4/ruby_define_if.m4])
28+
m4_include([tool/m4/ruby_defint.m4])
29+
m4_include([tool/m4/ruby_dtrace_available.m4])
30+
m4_include([tool/m4/ruby_dtrace_postprocess.m4])
31+
m4_include([tool/m4/ruby_func_attribute.m4])
32+
m4_include([tool/m4/ruby_mingw32.m4])
33+
m4_include([tool/m4/ruby_prepend_option.m4])
34+
m4_include([tool/m4/ruby_prog_gnu_ld.m4])
35+
m4_include([tool/m4/ruby_replace_funcs.m4])
36+
m4_include([tool/m4/ruby_replace_type.m4])
37+
m4_include([tool/m4/ruby_rm_recursive.m4])
38+
m4_include([tool/m4/ruby_setjmp_type.m4])
39+
m4_include([tool/m4/ruby_stack_grow_direction.m4])
40+
m4_include([tool/m4/ruby_try_cflags.m4])
41+
m4_include([tool/m4/ruby_try_cxxflags.m4])
42+
m4_include([tool/m4/ruby_try_ldflags.m4])
43+
m4_include([tool/m4/ruby_universal_arch.m4])
44+
m4_include([tool/m4/ruby_werror_flag.m4])
45+
1346
AC_ARG_VAR([cflags], [additional CFLAGS (ignored when CFLAGS is given)])
1447
AC_ARG_VAR([cppflags], [additional CPPFLAGS (ignored when CPPFLAGS is given)])
1548
AC_ARG_VAR([cxxflags], [additional CXXFLAGS (ignored when CXXFLAGS is given)])

0 commit comments

Comments
 (0)