com php-src: Fixing issue with config.m4 script not correctly checking for PHP_PASSWORD_ARGON2: ext/standard/config.m4 ext /standard/config.w32

From: Date: Tue, 02 Aug 2016 00:03:34 +0000
Subject: com php-src: Fixing issue with config.m4 script not correctly checking for PHP_PASSWORD_ARGON2: ext/standard/config.m4 ext /standard/config.w32
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94367@lists.php.net to get a copy of this message
Commit: d883f65d318374ea63db16de2ed92dccb5097356 Author: Charles R. Portwood II <charlesportwoodii@erianna.com> Mon, 1 Aug 2016 19:03:34 -0500 Parents: 0d4d8eab53d52ecdeca9b4630aeaa976fed3d6c5 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d883f65d318374ea63db16de2ed92dccb5097356 Log: Fixing issue with config.m4 script not correctly checking for PHP_PASSWORD_ARGON2 Changed paths: M ext/standard/config.m4 M ext/standard/config.w32 Diff: diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 0ab96c1..0b407ca 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -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) diff --git a/ext/standard/config.w32 b/ext/standard/config.w32 index 87679c3..b752d9c 100644 --- a/ext/standard/config.w32 +++ b/ext/standard/config.w32 @@ -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 {

« previous php.cvs (#94367) next »