ruby-changes:49863
From: shyouhei <ko1@a...>
Date: Sat, 20 Jan 2018 16:05:32 +0900 (JST)
Subject: [ruby-changes:49863] shyouhei:r61982 (trunk): set AC_CONFIG_MACRO_DIRS [close GH-1793]
shyouhei 2018-01-20 16:05:26 +0900 (Sat, 20 Jan 2018) New Revision: 61982 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61982 Log: set AC_CONFIG_MACRO_DIRS [close GH-1793] We do not use aclocal(1) by default. But in case users do so, AC_CONFIG_MACRO_DIRS help them reconstruct the same contents as this commit includes. Removed files: trunk/acinclude.m4 Modified files: trunk/aclocal.m4 trunk/configure.ac Index: acinclude.m4 =================================================================== --- acinclude.m4 (revision 61981) +++ acinclude.m4 (nonexistent) @@ -1,6 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/acinclude.m4#L0 -# -*- autoconf -*- - -m4_include([tool/m4/_colorize_result_prepare.m4])dnl -m4_include([tool/m4/colorize_result.m4])dnl -m4_include([tool/m4/ac_checking.m4])dnl -m4_include([tool/m4/ac_msg_result.m4])dnl Property changes on: acinclude.m4 ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -LF \ No newline at end of property Index: configure.ac =================================================================== --- configure.ac (revision 61981) +++ configure.ac (revision 61982) @@ -2,6 +2,7 @@ dnl Process this file with autoconf to p https://github.com/ruby/ruby/blob/trunk/configure.ac#L2 AC_INIT() { AC_CONFIG_AUX_DIR(tool) +AC_CONFIG_MACRO_DIRS(tool/m4) AC_PREREQ(2.67) @@ -11,8 +12,6 @@ AC_ARG_VAR([cflags], [additional CFLAGS] https://github.com/ruby/ruby/blob/trunk/configure.ac#L12 AC_ARG_VAR([cppflags], [additional CPPFLAGS]) AC_ARG_VAR([cxxflags], [additional CXXFLAGS]) -m4_include([tool/m4/ruby_rm_recursive.m4])dnl - { # environment section HAVE_BASERUBY=yes @@ -50,10 +49,6 @@ AS_IF([test x"$HAVE_GIT" = xyes], [comma https://github.com/ruby/ruby/blob/trunk/configure.ac#L49 AC_SUBST(GIT) AC_SUBST(HAVE_GIT) -m4_include([tool/m4/ruby_mingw32.m4])dnl -m4_include([tool/m4/ruby_cppoutfile.m4])dnl -m4_include([tool/m4/ruby_prog_gnu_ld.m4])dnl - eval `sed -n ['s/^@%:@define RUBY_API_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/API_\1=\2/p'] $srcdir/include/ruby/version.h` RUBY_PROGRAM_VERSION=`sed -n 's/^@%:@define RUBY_VERSION "\(.*\)"/\1/p' $srcdir/version.h` MAJOR=`echo $RUBY_PROGRAM_VERSION | cut -d. -f1` @@ -138,11 +133,6 @@ AS_IF([test -z "$target_alias" -a -n "$o https://github.com/ruby/ruby/blob/trunk/configure.ac#L133 target_os=`echo ${target_os} | sed "$os_version_style_transform"` ]) -m4_include([tool/m4/ruby_append_option.m4])dnl -m4_include([tool/m4/ruby_append_options.m4])dnl -m4_include([tool/m4/ruby_prepend_option.m4])dnl -m4_include([tool/m4/ruby_prepend_options.m4])dnl - AC_ARG_WITH(arch, AS_HELP_STRING([--with-arch=ARCHS], [build an Apple/NeXT Multi Architecture Binary (MAB); @@ -152,9 +142,6 @@ AC_ARG_WITH(arch, https://github.com/ruby/ruby/blob/trunk/configure.ac#L142 target platform]), [target_archs="$withval"], [unset target_archs]) -m4_include([tool/m4/ruby_default_arch.m4])dnl -m4_include([tool/m4/ruby_universal_arch.m4])dnl - AC_ARG_ENABLE(load-relative, AS_HELP_STRING([--enable-load-relative], [resolve load paths at run time]), [load_relative=$enableval]) @@ -362,9 +349,6 @@ AS_IF([test "x$MKDIR_P" = "x -d"], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L349 MAKEDIRS="$MKDIR_P" AC_SUBST(MAKEDIRS) -m4_include([tool/m4/ruby_dtrace_available.m4])dnl -m4_include([tool/m4/ruby_dtrace_postprocess.m4])dnl - AC_CHECK_PROG([DTRACE], [${ac_tool_prefix}dtrace], [${ac_tool_prefix}dtrace]) AS_IF([test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"], [ AC_CHECK_PROG([DTRACE], [dtrace], [dtrace]) @@ -413,8 +397,6 @@ AC_SUBST(CHDIR) https://github.com/ruby/ruby/blob/trunk/configure.ac#L397 } { # compiler section -m4_include([tool/m4/ruby_werror_flag.m4])dnl - RUBY_WERROR_FLAG([ AC_MSG_CHECKING([whether CFLAGS is valid]) AC_TRY_COMPILE([], [], @@ -443,9 +425,6 @@ RUBY_WERROR_FLAG([ https://github.com/ruby/ruby/blob/trunk/configure.ac#L425 cd .. && rm -fr tmp.$$.try_link ]) -m4_include([tool/m4/ruby_try_cflags.m4])dnl -m4_include([tool/m4/ruby_try_ldflags.m4])dnl - : ${DLDFLAGS="$LDFLAGS"} : ${RPATHFLAG=''} rpathflag='' @@ -1140,8 +1119,6 @@ AC_CACHE_CHECK([char bit], [rb_cv_char_b https://github.com/ruby/ruby/blob/trunk/configure.ac#L1119 [AC_INCLUDES_DEFAULT([@%:@include <limits.h>])], [rb_cv_char_bit=8]) test "$universal_binary" = yes && cross_compiling=$real_cross_compiling]) -m4_include([tool/m4/ruby_check_sizeof.m4])dnl - RUBY_CHECK_SIZEOF(int, [], [ILP]) RUBY_CHECK_SIZEOF(short) RUBY_CHECK_SIZEOF(long, [int], [ILP LP]) @@ -1172,17 +1149,12 @@ AS_IF([test "$rb_cv_packed_struct" != no https://github.com/ruby/ruby/blob/trunk/configure.ac#L1149 AC_DEFINE_UNQUOTED([PACKED_STRUCT(x)], x) ]) -m4_include([tool/m4/ruby_check_printf_prefix.m4])dnl - AS_IF([test "x$ac_cv_type_long_long" = xyes], [ RUBY_CHECK_PRINTF_PREFIX(long long, ll I64, LL) ], [test "x$ac_cv_type___int64" = xyes], [ RUBY_CHECK_PRINTF_PREFIX(__int64, ll I64, LL) ]) -m4_include([tool/m4/ruby_check_signedness.m4])dnl -m4_include([tool/m4/ruby_replace_type.m4])dnl - RUBY_REPLACE_TYPE(pid_t, int, PIDT) RUBY_REPLACE_TYPE(uid_t, int, UIDT) RUBY_REPLACE_TYPE(gid_t, int, GIDT) @@ -1284,8 +1256,6 @@ AS_IF([test "$rb_cv_va_args_macro" = yes https://github.com/ruby/ruby/blob/trunk/configure.ac#L1256 AC_DEFINE(HAVE_VA_ARGS_MACRO) ]) -m4_include([tool/m4/ruby_define_if.m4])dnl - AC_CACHE_CHECK([for alignas() syntax], rb_cv_have_alignas, [ rb_cv_have_alignas=no RUBY_WERROR_FLAG([ @@ -1328,10 +1298,6 @@ AS_IF([test "$rb_cv_have_alignof" != no] https://github.com/ruby/ruby/blob/trunk/configure.ac#L1298 AC_DEFINE_UNQUOTED(RUBY_ALIGNOF, $rb_cv_have_alignof) ]) -m4_include([tool/m4/ruby_decl_attribute.m4])dnl -m4_include([tool/m4/ruby_func_attribute.m4])dnl -m4_include([tool/m4/ruby_type_attribute.m4])dnl - RUBY_FUNC_ATTRIBUTE(__const__, CONSTFUNC) RUBY_FUNC_ATTRIBUTE(__pure__, PUREFUNC) RUBY_FUNC_ATTRIBUTE(__noreturn__, NORETURN) @@ -1577,8 +1543,6 @@ AS_IF([test "$rb_cv_large_fd_select" = y https://github.com/ruby/ruby/blob/trunk/configure.ac#L1543 AC_DEFINE(HAVE_RB_FD_INIT, 1) ]) -m4_include([tool/m4/ruby_defint.m4])dnl - RUBY_DEFINT(int8_t, 1) RUBY_DEFINT(uint8_t, 1, unsigned) RUBY_DEFINT(int16_t, 2) @@ -1935,8 +1899,6 @@ AS_IF([test "$ac_cv_func_crypt_r:$ac_cv_ https://github.com/ruby/ruby/blob/trunk/configure.ac#L1899 [AC_CHECK_MEMBERS([struct crypt_data.initialized], [], [], [AC_INCLUDES_DEFAULT([@%:@include <crypt.h>])])]) -m4_include([tool/m4/ruby_check_builtin_func.m4])dnl - RUBY_CHECK_BUILTIN_FUNC(__builtin_alloca_with_align, [__builtin_alloca_with_align(1, 4096)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_assume_aligned, [__builtin_assume_aligned((void*)32, 32)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap16, [__builtin_bswap16(0)]) @@ -2045,9 +2007,6 @@ AS_IF([test "$rb_cv_unsetenv_return_valu https://github.com/ruby/ruby/blob/trunk/configure.ac#L2007 AC_DEFINE(VOID_UNSETENV) ]) -m4_include([tool/m4/ruby_check_setjmp.m4])dnl -m4_include([tool/m4/ruby_check_builtin_setjmp.m4])dnl -m4_include([tool/m4/ruby_setjmp_type.m4])dnl # End of setjmp check. AC_ARG_ENABLE(setreuid, @@ -2248,12 +2207,9 @@ AS_IF([test x"$ac_cv_func_gettimeofday" https://github.com/ruby/ruby/blob/trunk/configure.ac#L2207 ]) AS_IF([test "$ac_cv_func_sysconf" = yes], [ - m4_include([tool/m4/ruby_check_sysconf.m4])dnl RUBY_CHECK_SYSCONF(CLK_TCK) ]) -m4_include([tool/m4/ruby_stack_grow_direction.m4])dnl - AS_IF([test "${universal_binary-no}" = yes ], [ archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'` save_CFLAGS="$CFLAGS" new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'` Index: aclocal.m4 =================================================================== --- aclocal.m4 (revision 61981) +++ aclocal.m4 (revision 61982) @@ -12,4 +12,35 @@ https://github.com/ruby/ruby/blob/trunk/aclocal.m4#L12 # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([acinclude.m4]) +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_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_ldflags.m4]) +m4_include([tool/m4/ruby_type_attribute.m4]) +m4_include([tool/m4/ruby_universal_arch.m4]) +m4_include([tool/m4/ruby_werror_flag.m4]) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/