From 852ab5d83fc350cabbe5d80237410ab9e2d47176 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 11 Jun 2019 17:19:43 +0200 Subject: Use %define api.pure instead of %pure-parser %pure-parser is deprecated. In our case there is no difference between true & full, as we don't use locations. --- ext/json/json_parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext') diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y index c3d0976ad9..ff9e50362a 100644 --- a/ext/json/json_parser.y +++ b/ext/json/json_parser.y @@ -46,7 +46,7 @@ int json_yydebug = 1; } -%pure-parser +%define api.pure full %define api.prefix {php_json_yy} %lex-param { php_json_parser *parser } %parse-param { php_json_parser *parser } -- cgit v1.2.1 From b654a0749233d89704d8b23ae6e758095fdfea1d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 12 Jun 2019 09:28:25 +0200 Subject: 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. --- ext/standard/config.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext') diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 20ff3d55c0..0a46b1e341 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) -- cgit v1.2.1