Skip to content

Commit dee2944

Browse files
authored
Autotools: Fix ext/standard sources (#15131)
This appends source files to the PHP_NEW_EXTENSION call and adds the possible compilation flag -DZEND_ENABLE_STATIC_TSRMLS_CACHE when building objects as done on all ext/standard sources already. Also, the PHP_EXT_DIR Autoconf macro doesn't accept any argument.
1 parent ae9b9ea commit dee2944

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

ext/standard/config.m4

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,16 @@ AH_TEMPLATE([PHP_USE_PHP_CRYPT_R],
8080
[Define to 1 if PHP uses its own crypt_r, and to 0 if using the external crypt
8181
library.])
8282

83+
php_ext_standard_sources=
8384
AS_VAR_IF([PHP_EXTERNAL_LIBCRYPT], [no], [
8485
AC_DEFINE([PHP_USE_PHP_CRYPT_R], [1])
85-
PHP_ADD_SOURCES([PHP_EXT_DIR([standard])],
86-
[crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c])
86+
php_ext_standard_sources=m4_normalize(["
87+
crypt_blowfish.c
88+
crypt_freesec.c
89+
crypt_sha256.c
90+
crypt_sha512.c
91+
php_crypt_r.c
92+
"])
8793
], [
8894
AC_SEARCH_LIBS([crypt], [crypt],
8995
[AC_DEFINE([HAVE_CRYPT], [1],
@@ -460,6 +466,7 @@ PHP_NEW_EXTENSION([standard], m4_normalize([
460466
var_unserializer.c
461467
var.c
462468
versioning.c
469+
$php_ext_standard_sources
463470
]),,,
464471
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
465472

0 commit comments

Comments
 (0)