Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove TSRM_BASIC_CHECKS

diff --cc TSRM/tsrm.m4
index 92a9f3992147bb843bdd8b9e23a38f10c3cdac1a,0330d7a7da4a489ab9f15aea771f174cf8dd1561..9f5c8001d85c2d2b617786f2a1f10d6937b1dbbb
--- 1/TSRM/tsrm.m4
--- 2/TSRM/tsrm.m4
+++ b/TSRM/tsrm.m4
@@@ -1,13 -1,43 +1,5 @@@
  dnl This file contains TSRM specific autoconf macros.
  
--dnl
- dnl TSRM_BASIC_CHECKS
 -dnl TSRM_CHECK_PTH
--dnl
- AC_DEFUN([TSRM_BASIC_CHECKS],[
- AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_PROG_RANLIB])dnl
 -AC_DEFUN([TSRM_CHECK_PTH],[
 -AC_MSG_CHECKING(for GNU Pth)
 -PTH_PREFIX="`$1 --prefix`"
 -if test -z "$PTH_PREFIX"; then
 -  AC_MSG_RESULT(Please check your Pth installation)
 -fi
 -
 -CPPFLAGS="$CPPFLAGS `$1 --cflags`"
 -LDFLAGS="$LDFLAGS `$1 --ldflags`"
 -LIBS="$LIBS `$1 --libs`"
 -
 -AC_DEFINE(GNUPTH, 1, [Whether you use GNU Pth])
 -AC_MSG_RESULT(yes - installed in $PTH_PREFIX)
 -])
 -
 -dnl
 -dnl TSRM_CHECK_ST
 -dnl
 -AC_DEFUN([TSRM_CHECK_ST],[
 -  if test -r "$1/include/st.h"; then
 -    CPPFLAGS="$CPPFLAGS -I$1/include"
 -    LDFLAGS="$LDFLAGS -L$1/lib"
 -  elif test -r "$1/st.h"; then
 -    CPPFLAGS="$CPPFLAGS -I$1"
 -    LDFLAGS="$LDFLAGS -L$1"
 -  fi
 -  AC_CHECK_HEADERS(st.h,[],[
 -    AC_MSG_ERROR([Sorry[,] I was unable to locate the State Threads header file.  Please specify the prefix using --with-tsrm-st=/prefix])
 -  ])
 -  LIBS="$LIBS -lst"
 -  AC_MSG_CHECKING(for SGI's State Threads)
 -  AC_MSG_RESULT(yes)
 -  AC_DEFINE(TSRM_ST, 1, [ ])
--])
--
  dnl
  dnl TSRM_CHECK_PTHREADS
  dnl

diff --cc configure.ac
index af8e670d799468df58e0ecee9dab41dc2b03ae87,b1c8eefe601c8eb8bc1b5ddd305677796dd8bf90..bfbe3710c725c0c00c733dbaf5c834cd7bcc7c58
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1223,9 -1222,8 +1223,8 @@@ unset LIBS LDFLAG
  
  PHP_HELP_SEPARATOR([TSRM:])
  PHP_CONFIGURE_PART(Configuring TSRM)
- TSRM_BASIC_CHECKS
  if test "$PHP_THREAD_SAFETY" = "yes"; then
 -  TSRM_THREADS_CHECKS
 +  TSRM_CHECK_PTHREADS
  fi
  
  dnl Align segments on huge page boundary