diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-03-23 08:15:53 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-03-25 08:00:17 +0100 |
| commit | bd73607b9e4811e7caa9d2ff4d227626ffd35dab (patch) | |
| tree | 8650946bffc376e3de3e21224edf28387f1fdd8b /TSRM/tsrm.m4 | |
| parent | 11663baa58692b3537416279b4e810d8e595dda3 (diff) | |
| download | php-git-bd73607b9e4811e7caa9d2ff4d227626ffd35dab.tar.gz | |
TSRM cleanup for PHP8
Diffstat (limited to 'TSRM/tsrm.m4')
| -rw-r--r-- | TSRM/tsrm.m4 | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4 index 0d60715fc8..3d86f415b9 100644 --- a/TSRM/tsrm.m4 +++ b/TSRM/tsrm.m4 @@ -11,41 +11,6 @@ AX_FUNC_WHICH_GETHOSTBYNAME_R() ]) - -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, [ ]) -]) - sinclude(threads.m4) AC_DEFUN([TSRM_CHECK_PTHREADS],[ @@ -61,38 +26,3 @@ AC_DEFINE(PTHREADS, 1, Whether to use Pthreads) AC_MSG_CHECKING(for POSIX threads) AC_MSG_RESULT(yes) ]) - -AC_DEFUN([TSRM_THREADS_CHECKS],[ - -dnl For the thread implementations, we always use --with-* -dnl to maintain consistency - -AC_ARG_WITH([tsrm-pth], - [AS_HELP_STRING([[--with-tsrm-pth[=pth-config]]], - [Use GNU Pth])], - [TSRM_PTH=$withval], - [TSRM_PTH=no]) - -AC_ARG_WITH([tsrm-st], - [AS_HELP_STRING([--with-tsrm-st], - [Use SGI's State Threads])], - [TSRM_ST=$withval], - [TSRM_ST=no]) - -AC_ARG_WITH([tsrm-pthreads], - [AS_HELP_STRING([--with-tsrm-pthreads], - [Use POSIX threads (default)])], - [TSRM_PTHREADS=$withval], - [TSRM_PTHREADS=yes]) - -test "$TSRM_PTH" = "yes" && TSRM_PTH=pth-config - -if test "$TSRM_PTH" != "no"; then - TSRM_CHECK_PTH($TSRM_PTH) -elif test "$TSRM_ST" != "no"; then - TSRM_CHECK_ST($TSRM_ST) -elif test "$TSRM_PTHREADS" != "no"; then - TSRM_CHECK_PTHREADS -fi - -]) |