mirror of
https://github.com/php/php-src.git
synced 2024-09-23 19:07:26 +00:00
Merge branch 'PHP-7.4'
* PHP-7.4: Fixed ZTS cache usage
This commit is contained in:
commit
59e954524e
@ -29,7 +29,7 @@ AC_DEFUN([PHP_MBSTRING_ADD_INSTALL_HEADERS], [
|
||||
])
|
||||
|
||||
AC_DEFUN([PHP_MBSTRING_EXTENSION], [
|
||||
PHP_NEW_EXTENSION(mbstring, $PHP_MBSTRING_SOURCES, $ext_shared,, $PHP_MBSTRING_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
|
||||
PHP_NEW_EXTENSION(mbstring, $PHP_MBSTRING_BASE_SOURCES $PHP_MBSTRING_SOURCES, $ext_shared,, $PHP_MBSTRING_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
|
||||
PHP_SUBST(MBSTRING_SHARED_LIBADD)
|
||||
|
||||
for dir in $PHP_MBSTRING_EXTRA_BUILD_DIRS; do
|
||||
@ -42,10 +42,8 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
|
||||
done
|
||||
|
||||
if test "$ext_shared" = "no"; then
|
||||
PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES)
|
||||
out="php_config.h"
|
||||
else
|
||||
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mbstring),$PHP_MBSTRING_BASE_SOURCES,,shared_objects_mbstring,yes)
|
||||
if test -f "$ext_builddir/config.h.in"; then
|
||||
out="$abs_builddir/config.h"
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user