Revert "merge revision(s) 18eaf0be905e3e251423b42d6f4e56b7cae1bc3b: [Backport #20494]"

This reverts commit ec30266267b2a063089b8ce7967203bcbadbdf4e.

3 files changed, 2 insertions, 11 deletions

diff --git a/configure.ac b/configure.ac
index 7976c12869..5ca1ffbedb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,6 @@ 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_header.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
@@ -1354,7 +1353,7 @@ AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [
 RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h)
 
 AS_IF([test "x$with_gmp" != xno],
-  [RUBY_CHECK_HEADER(gmp.h)
+  [AC_CHECK_HEADERS(gmp.h)
    AS_IF([test "x$ac_cv_header_gmp_h" != xno],
      AC_SEARCH_LIBS([__gmpz_init], [gmp],
        [AC_DEFINE(HAVE_LIBGMP, 1)]))])
diff --git a/tool/m4/ruby_check_header.m4 b/tool/m4/ruby_check_header.m4
deleted file mode 100644
index 171455549e..0000000000
--- a/tool/m4/ruby_check_header.m4
+++ /dev/null
@@ -1,8 +0,0 @@
-dnl -*- Autoconf -*-
-AC_DEFUN([RUBY_CHECK_HEADER],
-    [# RUBY_CHECK_HEADER($@)
-    save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS m4_if([$5], [], [$INCFLAGS], [$5])"
-    AC_CHECK_HEADER([$1], [$2], [$3], [$4])
-    CPPFLAGS="$save_CPPFLAGS"
-    unset save_CPPFLAGS])
diff --git a/version.h b/version.h
index fb7fa3124c..a0f980027f 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 4
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 177
+#define RUBY_PATCHLEVEL 176
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"