[前][次][番号順一覧][スレッド一覧]

ruby-changes:71529

From: Nobuyoshi <ko1@a...>
Date: Mon, 28 Mar 2022 17:12:35 +0900 (JST)
Subject: [ruby-changes:71529] 2cb3efffcf (master): Extract RUBY_REQUIRE_FUNCS

https://git.ruby-lang.org/ruby.git/commit/?id=2cb3efffcf

From 2cb3efffcf4e000c35d5b43574bfdecdc8a12e37 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 28 Mar 2022 16:56:15 +0900
Subject: Extract RUBY_REQUIRE_FUNCS

---
 configure.ac                  |  9 ++-------
 tool/m4/ruby_require_funcs.m4 | 13 +++++++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 tool/m4/ruby_require_funcs.m4

diff --git a/configure.ac b/configure.ac
index b63e395091..603cbebd03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,7 @@ m4_include([tool/m4/ruby_prepend_option.m4])dnl https://github.com/ruby/ruby/blob/trunk/configure.ac#L34
 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_require_funcs.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
@@ -1943,17 +1944,11 @@ AS_CASE(["$target_os"],[freebsd*],[ https://github.com/ruby/ruby/blob/trunk/configure.ac#L1944
 	 AC_REPLACE_FUNCS(close)
 	 ])
 
-AC_DEFUN([RUBY_REQUIRE_FUNC], [
-    AC_CHECK_FUNCS([$1])
-    AS_IF([test "$ac_cv_func_[]AS_TR_SH($1)" = yes], [],
-          [AC_MSG_ERROR($1[() must be supported])])
-])
-
 # dup and dup2 are always available except for WASI
 AS_CASE(["$target_os"],
     [wasi*], [],
     [
-        m4_map_args_w([dup dup2], [RUBY_REQUIRE_FUNC(], [)])
+        RUBY_REQUIRE_FUNCS(dup dup2)
     ]
 )
 
diff --git a/tool/m4/ruby_require_funcs.m4 b/tool/m4/ruby_require_funcs.m4
new file mode 100644
index 0000000000..2daa350e68
--- /dev/null
+++ b/tool/m4/ruby_require_funcs.m4
@@ -0,0 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/tool/m4/ruby_require_funcs.m4#L1
+dnl -*- Autoconf -*-
+dnl RUBY_REQUIRE_FUNC [func] [included]
+AC_DEFUN([RUBY_REQUIRE_FUNC], [
+# RUBY_REQUIRE_FUNC([$1], [$2])
+    AC_CHECK_FUNCS([$1])
+    AS_IF([test "$ac_cv_func_[]AS_TR_SH($1)" = yes], [],
+          [AC_MSG_ERROR($1[() must be supported])])
+])dnl
+dnl
+dnl RUBY_REQUIRE_FUNCS [funcs] [included]
+AC_DEFUN([RUBY_REQUIRE_FUNCS], [dnl
+    m4_map_args_w([$1], [RUBY_REQUIRE_FUNC(], [), [$2]])dnl
+])dnl
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]