From b654a0749233d89704d8b23ae6e758095fdfea1d Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 12 Jun 2019 09:28:25 +0200
Subject: [PATCH] Revert option rename

Let's keep this at --with-password-argon2 to avoid churn, I don't
think we have a strong motivation to rename this one.
---
 UPGRADING              | 3 +++
 ext/standard/config.m4 | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index 66be319cb9b..42671609cd4 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -608,6 +608,9 @@ The following extensions and SAPIs are affected:
 - SQLite3:
   . --with-sqlite3 no longer accepts a directory.
 
+- Standard:
+  . --with-password-argon2 no longer accepts a directory.
+
 - XSL:
   . --with-xsl no longer accepts a directory.
 
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 20ff3d55c05..0a46b1e3419 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -406,12 +406,12 @@ AC_CHECK_DECLS([arc4random_buf])
 dnl
 dnl Check for argon2
 dnl
-PHP_ARG_WITH([argon2],
+PHP_ARG_WITH([password-argon2],
   [whether to build with Argon2 support],
-  [AS_HELP_STRING([--with-argon2],
+  [AS_HELP_STRING([--with-password-argon2],
     [Build with Argon2 support])])
 
-if test "$PHP_ARGON2" != "no"; then
+if test "$PHP_PASSWORD_ARGON2" != "no"; then
   PKG_CHECK_MODULES([ARGON2], [libargon2])
 
   PHP_EVAL_INCLINE($ARGON2_CFLAGS)