com php-src: Merge branch 'PHP-7.4': ext/sqlite3/config0.m4

Commit: 7bdb4c82a5038819de61549d593a8ecaa8d9708f Author: Peter Kokot <peterkokot@gmail.com> Tue, 14 May 2019 03:20:11 +0200 Parents: 231d132f25c72567aae5fa23cdd567b759bd7950 dcfc2897323dc864a4d75e524f29d146d4c1554a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7bdb4c82a5038819de61549d593a8ecaa8d9708f Log: Merge branch 'PHP-7.4' * PHP-7.4: Update changelog Use pkg-config for sqlite3 and pdo_sqlite Changed paths: MM ext/sqlite3/config0.m4 Diff: diff --cc ext/sqlite3/config0.m4 index a31ac03,5fff973..cb67b96 --- a/ext/sqlite3/config0.m4 +++ b/ext/sqlite3/config0.m4 @@@ -6,10 -5,9 +5,9 @@@ PHP_ARG_WITH([sqlite3] [yes]) if test $PHP_SQLITE3 != "no"; then - PHP_SQLITE3_CFLAGS=" -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 " - dnl when running phpize enable_maintainer_zts is not available - if test -z "$enable_maintainer_zts"; then + dnl when running phpize enable_zts is not available + if test -z "$enable_zts"; then if test -f "$phpincludedir/main/php_config..h"; then ZTS=grep '#define ZTS' $phpincludedir/main/php_config.h|$SED 's/#define ZTS//' if test "$ZTS" -eq "1"; then