summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-07-01 13:26:17 +0200
committerPeter Kokot <peterkokot@gmail.com>2019-07-01 13:26:17 +0200
commitb757d49cb53f84cea17a97be4b1dd9c0a570af4d (patch)
tree25539291a58b56677c4250fd2f11579ddf7e4668
parentfa21fda6ab3fd2e63dc21d36bbb8b0491517a1ce (diff)
parent30c1c53164f8546f906f7200840c4af48f246701 (diff)
downloadphp-git-b757d49cb53f84cea17a97be4b1dd9c0a570af4d.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Remove TSRM_BASIC_CHECKS
-rw-r--r--TSRM/tsrm.m48
-rw-r--r--configure.ac1
2 files changed, 0 insertions, 9 deletions
diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4
index 92a9f39921..9f5c8001d8 100644
--- a/TSRM/tsrm.m4
+++ b/TSRM/tsrm.m4
@@ -1,14 +1,6 @@
dnl This file contains TSRM specific autoconf macros.
dnl
-dnl TSRM_BASIC_CHECKS
-dnl
-AC_DEFUN([TSRM_BASIC_CHECKS],[
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_RANLIB])dnl
-])
-
-dnl
dnl TSRM_CHECK_PTHREADS
dnl
AC_DEFUN([TSRM_CHECK_PTHREADS],[
diff --git a/configure.ac b/configure.ac
index af8e670d79..bfbe3710c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1223,7 +1223,6 @@ unset LIBS LDFLAGS
PHP_HELP_SEPARATOR([TSRM:])
PHP_CONFIGURE_PART(Configuring TSRM)
-TSRM_BASIC_CHECKS
if test "$PHP_THREAD_SAFETY" = "yes"; then
TSRM_CHECK_PTHREADS
fi