diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-17 16:18:03 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-17 16:18:03 +0200 |
| commit | 8a66cb35a3e097dc2b977a16a1806d740668ca3b (patch) | |
| tree | 4de467591a384ea3514c50902009740a03e92145 | |
| parent | 4ea28680a92609f72a5bdc71360b296ddf67282e (diff) | |
| parent | 66351025c8243563eb2b04e56eff9b50d367b286 (diff) | |
| download | php-git-8a66cb35a3e097dc2b977a16a1806d740668ca3b.tar.gz | |
Merge branch 'PHP-7.4'
| -rw-r--r-- | azure/configure.yml | 1 | ||||
| -rw-r--r-- | azure/i386/job.yml | 1 | ||||
| -rw-r--r-- | azure/macos/job.yml | 1 | ||||
| -rw-r--r-- | ext/hash/config.m4 | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/azure/configure.yml b/azure/configure.yml index 15f6847e0b..9de67ae13f 100644 --- a/azure/configure.yml +++ b/azure/configure.yml @@ -54,6 +54,7 @@ steps: --with-ldap \ --with-ldap-sasl \ --with-password-argon2 \ + --with-mhash \ --enable-werror \ --with-config-file-path=/etc \ --with-config-file-scan-dir=/etc/php.d diff --git a/azure/i386/job.yml b/azure/i386/job.yml index 36fb7e8291..3e78593534 100644 --- a/azure/i386/job.yml +++ b/azure/i386/job.yml @@ -61,6 +61,7 @@ jobs: --enable-sysvmsg \ --with-ffi \ --enable-zend-test \ + --with-mhash \ --enable-werror \ --with-config-file-path=/etc \ --with-config-file-scan-dir=/etc/php.d diff --git a/azure/macos/job.yml b/azure/macos/job.yml index e7559ca1e5..90045f13c7 100644 --- a/azure/macos/job.yml +++ b/azure/macos/job.yml @@ -64,6 +64,7 @@ jobs: --with-ffi \ --enable-zend-test \ --enable-intl \ + --with-mhash \ --enable-werror \ --with-config-file-path=/etc \ --with-config-file-scan-dir=/etc/php.d diff --git a/ext/hash/config.m4 b/ext/hash/config.m4 index 0e9e59fe62..d84e89cc6b 100644 --- a/ext/hash/config.m4 +++ b/ext/hash/config.m4 @@ -1,6 +1,6 @@ PHP_ARG_WITH([mhash], [for mhash support], - [AS_HELP_STRING([[--with-mhash[=DIR]]], + [AS_HELP_STRING([[--with-mhash]], [Include mhash support])]) if test "$PHP_MHASH" != "no"; then |