diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-07-05 23:30:51 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-07-05 23:30:51 +0200 |
| commit | b36b6c5fdf86fded9ed5736ddf4e0bc9a115435b (patch) | |
| tree | 5be89f1966b0d93bbcc078f6fcf9c81e5dc40550 | |
| parent | da8b583ac13aab669e7a86215530bdcdce9ef453 (diff) | |
| parent | 1c9e8e8f6a7d0180d312aa76ae87435619935780 (diff) | |
| download | php-git-b36b6c5fdf86fded9ed5736ddf4e0bc9a115435b.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove PTHREADS_ASSIGN_VARS
| -rw-r--r-- | TSRM/threads.m4 | 28 | ||||
| -rw-r--r-- | configure.ac | 15 |
2 files changed, 11 insertions, 32 deletions
diff --git a/TSRM/threads.m4 b/TSRM/threads.m4 index dde7f17257..dc5719bbec 100644 --- a/TSRM/threads.m4 +++ b/TSRM/threads.m4 @@ -102,13 +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 -PTHREADS_CHECK_COMPILE -LIBS=$save_LIBS -CFLAGS=$save_CFLAGS - AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[ ac_cv_pthreads_cflags= if test "$pthreads_working" != "yes"; then @@ -144,25 +137,4 @@ fi if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then pthreads_working="yes" fi - -if test "$pthreads_working" = "yes"; then - threads_result="POSIX-Threads found" -else - threads_result="POSIX-Threads not found" -fi -]) - -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 - LIBS="$LIBS -l$ac_cv_pthreads_lib" -fi - -if test -n "$ac_cv_pthreads_cflags"; then - CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" -fi ]) diff --git a/configure.ac b/configure.ac index f09ec29526..521e645e0d 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,8 @@ m4_include([build/libtool.m4]) m4_include([build/php_cxx_compile_stdcxx.m4]) m4_include([build/php.m4]) m4_include([build/pkg.m4]) +m4_include([TSRM/threads.m4]) +m4_include([TSRM/tsrm.m4]) dnl Basic autoconf initialization, generation of config.nice. dnl ---------------------------------------------------------------------------- @@ -310,12 +312,10 @@ case $host_alias in ;; esac -dnl Include Zend and TSRM configurations. +dnl Include Zend configurations. dnl ---------------------------------------------------------------------------- sinclude(Zend/Zend.m4) -sinclude(TSRM/threads.m4) -sinclude(TSRM/tsrm.m4) dnl ---------------------------------------------------------------------------- @@ -356,7 +356,14 @@ fi dnl Force ZTS. if test "$enable_zts" = "yes"; then - PTHREADS_ASSIGN_VARS + dnl Add pthreads linker and compiler flags. + if test -n "$ac_cv_pthreads_lib"; then + LIBS="$LIBS -l$ac_cv_pthreads_lib" + fi + if test -n "$ac_cv_pthreads_cflags"; then + CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" + fi + PTHREADS_FLAGS fi |