diff options
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -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 |
5 files changed, 8 insertions, 15 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]) diff --git a/configure.ac b/configure.ac index a09b5def03..79a0bebb93 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) 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 |