Skip to content

Commit 8a66cb3

Browse files
committed
Merge branch 'PHP-7.4'
2 parents 4ea2868 + 6635102 commit 8a66cb3

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

azure/configure.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ steps:
5454
--with-ldap \
5555
--with-ldap-sasl \
5656
--with-password-argon2 \
57+
--with-mhash \
5758
--enable-werror \
5859
--with-config-file-path=/etc \
5960
--with-config-file-scan-dir=/etc/php.d

azure/i386/job.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
--enable-sysvmsg \
6262
--with-ffi \
6363
--enable-zend-test \
64+
--with-mhash \
6465
--enable-werror \
6566
--with-config-file-path=/etc \
6667
--with-config-file-scan-dir=/etc/php.d

azure/macos/job.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ jobs:
6464
--with-ffi \
6565
--enable-zend-test \
6666
--enable-intl \
67+
--with-mhash \
6768
--enable-werror \
6869
--with-config-file-path=/etc \
6970
--with-config-file-scan-dir=/etc/php.d

ext/hash/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PHP_ARG_WITH([mhash],
22
[for mhash support],
3-
[AS_HELP_STRING([[--with-mhash[=DIR]]],
3+
[AS_HELP_STRING([[--with-mhash]],
44
[Include mhash support])])
55

66
if test "$PHP_MHASH" != "no"; then

0 commit comments

Comments
 (0)