clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing issue with config.m4 script not correctly checking for PHP_PASSWORD_ARGON2

Browse Source
This commit is contained in:
Charles R. Portwood II 2016-08-01 19:03:34 -05:00
parent 0d4d8eab53
commit d883f65d31
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/standard/config.m4
View File

@ -556,9 +556,9 @@ dnl
PHP_ARG_WITH(password-argon2, for Argon2 support,
[ --with-password-argon2[=DIR] Include Argon2 support in password_*. DIR is the Argon2 shared library path]])
if test "$PHP_ARGON2" != "no"; then
if test "$PHP_PASSWORD_ARGON2" != "no"; then
AC_MSG_CHECKING([for Argon2 library])
for i in $PHP_ARGON2 /usr /usr/local ; do
for i in $PHP_PASSWORD_ARGON2 /usr /usr/local ; do
if test -r $i/include/argon2.h; then
ARGON2_DIR=$i;
AC_MSG_RESULT(found in $i)

4
ext/standard/config.w32
View File

@ -3,8 +3,8 @@
ARG_WITH("password-argon2", "Argon2 support", "no");
if (PHP_ARGON2 != "no") {
if (CHECK_LIB("Argon2Ref.lib", null, PHP_ARGON2)
if (PHP_PASSWORD_ARGON2 != "no") {
if (CHECK_LIB("Argon2Ref.lib", null, PHP_PASSWORD_ARGON2)
&& CHECK_HEADER_ADD_INCLUDE("argon2.h", "CFLAGS")) {
AC_DEFINE('HAVE_ARGON2LIB', 1);
} else {