ruby-changes:65882
From: Nobuyoshi <ko1@a...>
Date: Sat, 17 Apr 2021 20:06:21 +0900 (JST)
Subject: [ruby-changes:65882] 1f56238032 (master): Remove comments in tool/m4 from the generated configure
https://git.ruby-lang.org/ruby.git/commit/?id=1f56238032 From 1f56238032482ab55db2a7cbf5c156b5ccc17526 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sat, 17 Apr 2021 19:14:21 +0900 Subject: Remove comments in tool/m4 from the generated configure --- configure.ac | 74 ++++++++++++++++++------------------ tool/m4/_colorize_result_prepare.m4 | 2 +- tool/m4/ac_msg_result.m4 | 2 +- tool/m4/colorize_result.m4 | 2 +- tool/m4/ruby_append_option.m4 | 2 +- tool/m4/ruby_append_options.m4 | 2 +- tool/m4/ruby_check_builtin_func.m4 | 2 +- tool/m4/ruby_check_builtin_setjmp.m4 | 2 +- tool/m4/ruby_check_printf_prefix.m4 | 2 +- tool/m4/ruby_check_setjmp.m4 | 4 +- tool/m4/ruby_check_signedness.m4 | 2 +- tool/m4/ruby_check_sizeof.m4 | 2 +- tool/m4/ruby_check_sysconf.m4 | 2 +- tool/m4/ruby_cppoutfile.m4 | 2 +- tool/m4/ruby_decl_attribute.m4 | 2 +- tool/m4/ruby_default_arch.m4 | 5 +-- tool/m4/ruby_define_if.m4 | 2 +- tool/m4/ruby_defint.m4 | 2 +- tool/m4/ruby_dtrace_available.m4 | 2 +- tool/m4/ruby_dtrace_postprocess.m4 | 2 +- tool/m4/ruby_func_attribute.m4 | 2 +- tool/m4/ruby_mingw32.m4 | 2 +- tool/m4/ruby_prepend_option.m4 | 2 +- tool/m4/ruby_prog_gnu_ld.m4 | 2 +- tool/m4/ruby_replace_funcs.m4 | 8 ++-- tool/m4/ruby_replace_type.m4 | 2 +- tool/m4/ruby_rm_recursive.m4 | 2 +- tool/m4/ruby_setjmp_type.m4 | 2 +- tool/m4/ruby_stack_grow_direction.m4 | 2 +- tool/m4/ruby_try_cflags.m4 | 2 +- tool/m4/ruby_try_cxxflags.m4 | 2 +- tool/m4/ruby_try_ldflags.m4 | 2 +- tool/m4/ruby_type_attribute.m4 | 2 +- tool/m4/ruby_universal_arch.m4 | 2 +- tool/m4/ruby_werror_flag.m4 | 2 +- 35 files changed, 76 insertions(+), 77 deletions(-) diff --git a/configure.ac b/configure.ac index ebfd52f..fa62b5f 100644 --- a/configure.ac +++ b/configure.ac @@ -9,43 +9,43 @@ tooldir="$srcdir/tool" https://github.com/ruby/ruby/blob/trunk/configure.ac#L9 AC_DISABLE_OPTION_CHECKING -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_cxxflags.m4]) -m4_include([tool/m4/ruby_try_ldflags.m4]) -m4_include([tool/m4/ruby_universal_arch.m4]) -m4_include([tool/m4/ruby_werror_flag.m4]) - -AC_ARG_VAR([cflags], [additional CFLAGS (ignored when CFLAGS is given)]) -AC_ARG_VAR([cppflags], [additional CPPFLAGS (ignored when CPPFLAGS is given)]) -AC_ARG_VAR([cxxflags], [additional CXXFLAGS (ignored when CXXFLAGS is given)]) +m4_include([tool/m4/_colorize_result_prepare.m4])dnl +m4_include([tool/m4/ac_msg_result.m4])dnl +m4_include([tool/m4/colorize_result.m4])dnl +m4_include([tool/m4/ruby_append_option.m4])dnl +m4_include([tool/m4/ruby_append_options.m4])dnl +m4_include([tool/m4/ruby_check_builtin_func.m4])dnl +m4_include([tool/m4/ruby_check_builtin_setjmp.m4])dnl +m4_include([tool/m4/ruby_check_printf_prefix.m4])dnl +m4_include([tool/m4/ruby_check_setjmp.m4])dnl +m4_include([tool/m4/ruby_check_signedness.m4])dnl +m4_include([tool/m4/ruby_check_sizeof.m4])dnl +m4_include([tool/m4/ruby_check_sysconf.m4])dnl +m4_include([tool/m4/ruby_cppoutfile.m4])dnl +m4_include([tool/m4/ruby_decl_attribute.m4])dnl +m4_include([tool/m4/ruby_default_arch.m4])dnl +m4_include([tool/m4/ruby_define_if.m4])dnl +m4_include([tool/m4/ruby_defint.m4])dnl +m4_include([tool/m4/ruby_dtrace_available.m4])dnl +m4_include([tool/m4/ruby_dtrace_postprocess.m4])dnl +m4_include([tool/m4/ruby_func_attribute.m4])dnl +m4_include([tool/m4/ruby_mingw32.m4])dnl +m4_include([tool/m4/ruby_prepend_option.m4])dnl +m4_include([tool/m4/ruby_prog_gnu_ld.m4])dnl +m4_include([tool/m4/ruby_replace_funcs.m4])dnl +m4_include([tool/m4/ruby_replace_type.m4])dnl +m4_include([tool/m4/ruby_rm_recursive.m4])dnl +m4_include([tool/m4/ruby_setjmp_type.m4])dnl +m4_include([tool/m4/ruby_stack_grow_direction.m4])dnl +m4_include([tool/m4/ruby_try_cflags.m4])dnl +m4_include([tool/m4/ruby_try_cxxflags.m4])dnl +m4_include([tool/m4/ruby_try_ldflags.m4])dnl +m4_include([tool/m4/ruby_universal_arch.m4])dnl +m4_include([tool/m4/ruby_werror_flag.m4])dnl + +AC_ARG_VAR([cflags], [additional CFLAGS (ignored when CFLAGS is given)])dnl +AC_ARG_VAR([cppflags], [additional CPPFLAGS (ignored when CPPFLAGS is given)])dnl +AC_ARG_VAR([cxxflags], [additional CXXFLAGS (ignored when CXXFLAGS is given)])dnl : "environment section" && { HAVE_BASERUBY=yes diff --git a/tool/m4/_colorize_result_prepare.m4 b/tool/m4/_colorize_result_prepare.m4 index cc2bbaa..c8478bd 100644 --- a/tool/m4/_colorize_result_prepare.m4 +++ b/tool/m4/_colorize_result_prepare.m4 @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/tool/m4/_colorize_result_prepare.m4#L1 -# -*- Autoconf -*- +dnl -*- Autoconf -*- AC_DEFUN([_COLORIZE_RESULT_PREPARE], [ msg_checking= msg_result_yes= msg_result_no= msg_result_other= msg_reset= AS_CASE(["x${CONFIGURE_TTY}"], diff --git a/tool/m4/ac_msg_result.m4 b/tool/m4/ac_msg_result.m4 index bcc7a63..12a3617 100644 --- a/tool/m4/ac_msg_result.m4 +++ b/tool/m4/ac_msg_result.m4 @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/tool/m4/ac_msg_result.m4#L1 -# -*- Autoconf -*- +dnl -*- Autoconf -*- AC_DEFUN([AC_MSG_RESULT], [dnl { _AS_ECHO_LOG([result: $1]) COLORIZE_RESULT([$1]); dnl diff --git a/tool/m4/colorize_result.m4 b/tool/m4/colorize_result.m4 index 19ff6d4..8391204 100644 --- a/tool/m4/colorize_result.m4 +++ b/tool/m4/colorize_result.m4 @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/tool/m4/colorize_result.m4#L1 -# -*- Autoconf -*- +dnl -*- Autoconf -*- AC_DEFUN([COLORIZE_RESULT], [AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl AS_LITERAL_IF([$1], [m4_case([$1], diff --git a/tool/m4/ruby_append_option.m4 b/tool/m4/ruby_append_option.m4 index 07b6537..ff828d2 100644 --- a/tool/m4/ruby_append_option.m4 +++ b/tool/m4/ruby_append_option.m4 @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/tool/m4/ruby_append_option.m4#L1 -# -*- Autoconf -*- +dnl -*- Autoconf -*- AC_DEFUN([RUBY_APPEND_OPTION], [# RUBY_APPEND_OPTION($1) AS_CASE([" [$]{$1-} "], diff --git a/tool/m4/ruby_append_options.m4 b/tool/m4/ruby_append_options.m4 index 164a4ab..1421311 100644 --- a/tool/m4/ruby_append_options.m4 +++ b/tool/m4/ruby_append_options.m4 @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/tool/m4/ruby_append_options.m4#L1 -# -*- Autoconf -*- +dnl -*- Autoconf -*- AC_DEFUN([RUBY_APPEND_OPTIONS], [# RUBY_APPEND_OPTIONS($1) for rb_opt in $2; do diff --git a/tool/m4/ruby_check_builtin_func.m4 b/tool/m4/ruby_check_builtin_func.m4 index 3fe5caf..40abc78 100644 --- a/tool/m4/ruby_check_builtin_func.m4 +++ b/tool/m4/ruby_check_builtin_func.m4 @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/tool/m4/ruby_check_builtin_func.m4#L1 -# -*- Autoconf -*- +dnl -*- Autoconf -*- AC_DEFUN([RUBY_CHECK_BUILTIN_FUNC], [dnl AC_CACHE_CHECK([for $1], AS_TR_SH(rb_cv_builtin_$1), [AC_LINK_IFELSE( diff --git a/tool/m4/ruby_check_builtin_setjmp.m4 b/tool/m4/ruby_check_builtin_setjmp.m4 index 008fd45..05118e2 100644 --- a/tool/m4/ruby_check_builtin_setjmp.m4 +++ b/tool/m4/ruby_check_builtin_setjmp.m4 @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/tool/m4/ruby_check_builtin_setjmp.m4#L1 -# -*- Autoconf -*- +dnl -*- Autoconf -*- AC_DEFUN([RUBY_CHECK_BUILTIN_SETJMP], [ AS_IF([test x"${ac_cv_func___builtin_setjmp}" = xyes], [ unset ac_cv_func___builtin_setjmp diff --git a/tool/m4/ruby_check_printf_prefix.m4 b/tool/m4/ruby_check_printf_prefix.m4 index 0415f9f..15bb4ae 100644 --- a/tool/m4/ruby_check_printf_prefix.m4 +++ b/tool/m4/ruby_check_printf_prefix.m4 @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/tool/m4/ruby_check_printf_prefix.m4#L1 -# -*- Autoconf -*- +dnl -*- Autoconf -*- AC_DEFUN([RUBY_CHECK_PRINTF_PREFIX], [ AC_CACHE_CHECK([for printf prefix for $1], [rb_cv_pri_prefix_]AS_TR_SH($1),[ [rb_cv_pri_prefix_]AS_TR_SH($1)=[NONE] diff --git a/tool/m4/ruby_check_setjmp.m4 b/tool/m4/ruby_check_setjmp.m4 index 6665298..6020b76 100644 --- a/tool/m4/ruby_check_setjmp.m4 +++ b/tool/m4/ruby_check_setjmp.m4 @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/tool/m4/ruby_check_setjmp.m4#L1 -# -*- Autoconf -*- -# used for AC_ARG_WITH(setjmp-type) +dnl -*- Autoconf -*- +dnl used for AC_ARG_WITH(setjmp-type) AC_DEFUN([RUBY_CHECK_SETJMP], [ AC_CACHE_CHECK([for ]$1[ as a macro or function], ac_cv_func_$1, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ diff --git a/tool/m4/ruby_check_signedness.m4 b/tool/m4/ruby_check_signedness.m4 index 5376efa..f9fbb3c 100644 --- a/tool/m4/ruby_check_signedness.m4 +++ b/tool/m4/ruby_check_signedness.m4 @@ -1,4 +1,4 @@ https://github (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/