mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
commit
7db29d2186
@ -190,12 +190,6 @@ dnl LIBZEND_OTHER_CHECKS
|
||||
dnl
|
||||
AC_DEFUN([LIBZEND_OTHER_CHECKS],[
|
||||
|
||||
AC_ARG_ENABLE([zts],
|
||||
[AS_HELP_STRING([--enable-zts],
|
||||
[Enable thread safety])],
|
||||
[ZEND_ZTS=$enableval],
|
||||
[ZEND_ZTS=no])
|
||||
|
||||
AC_MSG_CHECKING(whether to enable thread-safety)
|
||||
AC_MSG_RESULT($ZEND_ZTS)
|
||||
|
||||
|
20
configure.ac
20
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"
|
||||
|
||||
|
@ -66,7 +66,7 @@ if test "$PHP_OPCACHE" != "no"; then
|
||||
esac
|
||||
fi
|
||||
|
||||
if test "$enable_zts" = "yes"; then
|
||||
if test "$PHP_THREAD_SAFETY" = "yes"; then
|
||||
DASM_FLAGS="$DASM_FLAGS -D ZTS=1"
|
||||
fi
|
||||
|
||||
|
@ -31,7 +31,7 @@ if test "$PHP_MM" != "no"; then
|
||||
AC_MSG_ERROR(cannot find mm library)
|
||||
fi
|
||||
|
||||
if test "$enable_zts" = "yes"; then
|
||||
if test "$PHP_THREAD_SAFETY" = "yes"; then
|
||||
dnl The mm library is not thread-safe, and mod_mm.c refuses to compile.
|
||||
AC_MSG_ERROR(--with-mm cannot be combined with --enable-zts)
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user