Skip to content

Commit d883f65

Browse files
Fixing issue with config.m4 script not correctly checking for PHP_PASSWORD_ARGON2
1 parent 0d4d8ea commit d883f65

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ext/standard/config.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,9 +556,9 @@ dnl
556556
PHP_ARG_WITH(password-argon2, for Argon2 support,
557557
[ --with-password-argon2[=DIR] Include Argon2 support in password_*. DIR is the Argon2 shared library path]])
558558

559-
if test "$PHP_ARGON2" != "no"; then
559+
if test "$PHP_PASSWORD_ARGON2" != "no"; then
560560
AC_MSG_CHECKING([for Argon2 library])
561-
for i in $PHP_ARGON2 /usr /usr/local ; do
561+
for i in $PHP_PASSWORD_ARGON2 /usr /usr/local ; do
562562
if test -r $i/include/argon2.h; then
563563
ARGON2_DIR=$i;
564564
AC_MSG_RESULT(found in $i)

ext/standard/config.w32

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
ARG_WITH("password-argon2", "Argon2 support", "no");
55

6-
if (PHP_ARGON2 != "no") {
7-
if (CHECK_LIB("Argon2Ref.lib", null, PHP_ARGON2)
6+
if (PHP_PASSWORD_ARGON2 != "no") {
7+
if (CHECK_LIB("Argon2Ref.lib", null, PHP_PASSWORD_ARGON2)
88
&& CHECK_HEADER_ADD_INCLUDE("argon2.h", "CFLAGS")) {
99
AC_DEFINE('HAVE_ARGON2LIB', 1);
1010
} else {

0 commit comments

Comments
 (0)