From 1c9e8e8f6a7d0180d312aa76ae87435619935780 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Tue, 2 Jul 2019 01:00:14 +0200 Subject: Remove PTHREADS_ASSIGN_VARS This simplifies TSRM build steps a bit and avoids doing unnecessary steps: - The `PTHREADS_CHECK_COMPILE` can called inside the for loops only since this is only where the `$pthreads_checked` variable is used. - Assigning variables can be then done only in the configure.ac once. - use `m4_include()` instead of the `sinclude()` in the middle of the build steps. - The `$threads_result` variable is not used in the code or in extensions. --- configure.ac | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 35fadf7ee4..037e87511a 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 ---------------------------------------------------------------------------- @@ -309,12 +311,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 ---------------------------------------------------------------------------- @@ -355,7 +355,14 @@ fi dnl Force ZTS. if test "$enable_maintainer_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 -- cgit v1.2.1