diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-05-12 18:51:50 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-05-12 18:51:50 +0200 |
| commit | 2cf90bb2f006e2973b666426b18596e2e67ccfd9 (patch) | |
| tree | 119e06295fd516d1dbf2ecf3c316b6ab7af7c67c /TSRM | |
| parent | 3005d6c21d8a4d6115a8159934b604e10b8a1136 (diff) | |
| parent | 75fb74860da7decd94432a4d211795310308a4a8 (diff) | |
| download | php-git-2cf90bb2f006e2973b666426b18596e2e67ccfd9.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Normalize comments in *nix build system m4 files
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/threads.m4 | 25 | ||||
| -rw-r--r-- | TSRM/tsrm.m4 | 10 |
2 files changed, 22 insertions, 13 deletions
diff --git a/TSRM/threads.m4 b/TSRM/threads.m4 index 55864c8982..dde7f17257 100644 --- a/TSRM/threads.m4 +++ b/TSRM/threads.m4 @@ -28,7 +28,7 @@ dnl OF THE POSSIBILITY OF SUCH DAMAGE. dnl dnl PTHREADS_FLAGS dnl -dnl Set some magic defines to achieve POSIX threads conformance +dnl Set some magic defines to achieve POSIX threads conformance. dnl AC_DEFUN([PTHREADS_FLAGS],[ if test -z "$host_alias" && test -n "$host"; then @@ -52,18 +52,17 @@ AC_DEFUN([PTHREADS_FLAGS],[ PTHREAD_FLAGS=-D_REENTRANT;; *sco*) PTHREAD_FLAGS=-D_REENTRANT;; -dnl Solves sigwait() problem, creates problems with u_long etc. -dnl PTHREAD_FLAGS="-D_REENTRANT -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE_EXTENDED=1";; esac if test -n "$PTHREAD_FLAGS"; then CPPFLAGS="$CPPFLAGS $PTHREAD_FLAGS" fi -])dnl +]) + dnl dnl PTHREADS_CHECK_COMPILE dnl -dnl Check whether the current setup can use POSIX threads calls +dnl Check whether the current setup can use POSIX threads calls. dnl AC_DEFUN([PTHREADS_CHECK_COMPILE], [ AC_LINK_IFELSE([ AC_LANG_SOURCE([ @@ -85,11 +84,12 @@ int main() { ], [ pthreads_checked=no ] -) ] )dnl +) ] ) + dnl -dnl PTHREADS_CHECK() +dnl PTHREADS_CHECK dnl -dnl Try to find a way to enable POSIX threads +dnl Try to find a way to enable POSIX threads. dnl dnl Magic flags dnl -kthread gcc (FreeBSD) @@ -102,7 +102,6 @@ dnl -qthreaded AIX cc V5 dnl -threads gcc (HP-UX) dnl AC_DEFUN([PTHREADS_CHECK],[ - save_CFLAGS=$CFLAGS save_LIBS=$LIBS PTHREADS_ASSIGN_VARS @@ -151,8 +150,12 @@ if test "$pthreads_working" = "yes"; then else threads_result="POSIX-Threads not found" fi -])dnl +]) + dnl +dnl PTHREADS_ASSIGN_VARS +dnl +dnl Adds pthreads linker and compiler flags. dnl AC_DEFUN([PTHREADS_ASSIGN_VARS],[ if test -n "$ac_cv_pthreads_lib"; then @@ -162,4 +165,4 @@ fi if test -n "$ac_cv_pthreads_cflags"; then CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" fi -])dnl +]) diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4 index 0fb9861c5f..8cc53a15af 100644 --- a/TSRM/tsrm.m4 +++ b/TSRM/tsrm.m4 @@ -1,13 +1,19 @@ -AC_DEFUN([TSRM_BASIC_CHECKS],[ +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 AC_CHECK_FUNCS(sigprocmask) ]) +dnl +dnl TSRM_CHECK_PTHREADS +dnl AC_DEFUN([TSRM_CHECK_PTHREADS],[ - PTHREADS_CHECK if test "$pthreads_working" != "yes"; then |