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

diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 0ab96c1f2cd393e1302581146854b5cd32d6e6ac..0b407ca27cf2e742d3154d5920bb29747ab8fb63 100644 (file)
--- 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 87679c3e38026244d4631df47d7fe10aee0b2988..b752d9cb8c3740c6c3db4d73713cc1eaa3dac4be 100644 (file)
--- 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 {