diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-25 11:48:51 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-25 11:48:51 +0100 |
| commit | 7db29d2186a8b6f623f96063a8a5c67e78b93720 (patch) | |
| tree | 516f36f90f89ce5a095c6523c43564cab0925e59 /configure.ac | |
| parent | 30770e576ab848e267ed302ffab25feed32301ff (diff) | |
| parent | 4633e70ab1d03cbbfdb166a3c1912d2277c02882 (diff) | |
| download | php-git-7db29d2186a8b6f623f96063a8a5c67e78b93720.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80377
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 6b33047538..ffc35ad723 100644 --- a/configure.ac +++ b/configure.ac @@ -797,6 +797,19 @@ if test "$PHP_DEBUG_ASSERTIONS" = "yes"; then ZEND_DEBUG=yes fi +AC_ARG_ENABLE([zts], + [AS_HELP_STRING([--enable-zts], + [Enable thread safety])], + [ZEND_ZTS=$enableval], + [ZEND_ZTS=no]) + +if test "$ZEND_ZTS" = "yes"; then + AC_DEFINE(ZTS, 1,[ ]) + PHP_THREAD_SAFETY=yes +else + PHP_THREAD_SAFETY=no +fi + PHP_ARG_ENABLE([rtld-now], [whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY], [AS_HELP_STRING([--enable-rtld-now], @@ -1136,13 +1149,6 @@ LIBZEND_BASIC_CHECKS LIBZEND_DLSYM_CHECK LIBZEND_OTHER_CHECKS -if test "$ZEND_ZTS" = "yes"; then - AC_DEFINE(ZTS,1,[ ]) - PHP_THREAD_SAFETY=yes -else - PHP_THREAD_SAFETY=no -fi - INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" INCLUDES="$INCLUDES -I\$(top_builddir)/Zend" |