kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

deal with aclocal(1)

Browse source 
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
This commit is contained in:
shyouhei 2018-02-06 02:08:13 +00:00
parent 1f003810c2
commit eb537609ba
5 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aclocal.m4 vendored
View file

@ -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])

7
configure.ac
View file

@ -6,6 +6,13 @@ AC_CONFIG_MACRO_DIRS(tool/m4)
AC_PREREQ(2.67)
dnl override AC_CHECKING
dnl placed here due to aclocal(1)'s
dnl ignoring this definition in separate files
AC_DEFUN([AC_CHECKING],[dnl
AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
AS_MESSAGE([checking ${msg_checking}$1${msg_reset}...])])dnl
AC_DISABLE_OPTION_CHECKING
AC_ARG_VAR([cflags], [additional CFLAGS])

4
tool/m4/ac_checking.m4
View file

@ -1,4 +0,0 @@
# -*- Autoconf -*-
AC_DEFUN([AC_CHECKING],[dnl
AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
AS_MESSAGE([checking ${msg_checking}$1${msg_reset}...])])dnl

2
tool/m4/ruby_check_va_copy.m4
View file

@ -1,5 +1,5 @@
# -*- Autoconf -*-
m4_define(RUBY_CHECK_VA_COPY, [
AC_DEFUN([RUBY_CHECK_VA_COPY], [
if test "x$rb_cv_va_copy" = x; then
AC_TRY_RUN(
[#include <stdlib.h>

8
tool/m4/ruby_prepend_options.m4
View file

@ -1,8 +0,0 @@
# -*- Autoconf -*-
AC_DEFUN([RUBY_PREPEND_OPTIONS],
[# RUBY_PREPEND_OPTIONS($1)
unset rb_opts; for rb_opt in $2; do
AS_CASE([" [$]{rb_opts} [$]{$1-} "],
[*" [$]{rb_opt} "*], [], [' '], [ $1="[$]{rb_opt}"], [ rb_opts="[$]{rb_opts}[$]{rb_opt} "])
done
$1="[$]{rb_opts}[$]$1"])dnl