diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-06 02:08:13 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-06 02:08:13 +0000 |
| commit | eb537609ba0de060c6633dc3e7dd9ba5e85c6d1b (patch) | |
| tree | cb3d89826021f803594adeaf7e96699da371c33a /tool | |
| parent | 1f003810c22ca758bcf9c83b2f1f4755d74c47e1 (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 'tool')
| -rw-r--r-- | tool/m4/ac_checking.m4 | 4 | ||||
| -rw-r--r-- | tool/m4/ruby_check_va_copy.m4 | 2 | ||||
| -rw-r--r-- | tool/m4/ruby_prepend_options.m4 | 8 |
3 files changed, 1 insertions, 13 deletions
diff --git a/tool/m4/ac_checking.m4 b/tool/m4/ac_checking.m4 deleted file mode 100644 index 1a9d2a49bf..0000000000 --- a/tool/m4/ac_checking.m4 +++ /dev/null @@ -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 diff --git a/tool/m4/ruby_check_va_copy.m4 b/tool/m4/ruby_check_va_copy.m4 index 403ef801f2..4672d1852c 100644 --- a/tool/m4/ruby_check_va_copy.m4 +++ b/tool/m4/ruby_check_va_copy.m4 @@ -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> diff --git a/tool/m4/ruby_prepend_options.m4 b/tool/m4/ruby_prepend_options.m4 deleted file mode 100644 index 3cde02217f..0000000000 --- a/tool/m4/ruby_prepend_options.m4 +++ /dev/null @@ -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 |