Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove sinclude from tsrm.m4

diff --cc TSRM/tsrm.m4
index 3d86f415b977f3c5df6f4184c3829ad60365d47c,693ddb392fc0e8d663964395a16dbede0d2b9d24..afa7f4e67c531c198f7b8c887f55d2c64fed05a3
--- 1/TSRM/tsrm.m4
--- 2/TSRM/tsrm.m4
+++ b/TSRM/tsrm.m4
@@@ -11,8 -11,41 +11,6 @@@ AX_FUNC_WHICH_GETHOSTBYNAME_R(
  
  ])
  
- sinclude(threads.m4)
 -
 -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)
 -
 -])
 -
 -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, [ ])
 -])
--
  AC_DEFUN([TSRM_CHECK_PTHREADS],[
  
  PTHREADS_CHECK