From 9bbf9967bd2ae5094e00fc6649d46f6082b44097 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Thu, 11 Oct 2018 12:58:41 +0200 Subject: [PATCH] Modernize the AC_PRESERVE_HELP_ORDER macro call The Autoconf AC_PRESERVE_HELP_ORDER macro has been available since Autoconf 2.59c [1] and in PHP it has been called conditionally on two places to support older Autoconf versions. With recent updates and the macro can be called unconditionally. [1] http://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS --- configure.ac | 2 +- scripts/phpize.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 81c7f9ccc3d..09cb2706bbc 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ dnl ------------------------------------------------------------------------- AC_PREREQ([2.68]) AC_INIT(README.GIT-RULES) -ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], []) +AC_PRESERVE_HELP_ORDER PHP_CONFIG_NICE(config.nice) diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 index 55fa08d7c45..43cae33c2f1 100644 --- a/scripts/phpize.m4 +++ b/scripts/phpize.m4 @@ -2,7 +2,7 @@ dnl This file becomes configure.ac for self-contained extensions. AC_PREREQ([2.68]) AC_INIT(config.m4) -ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], []) +AC_PRESERVE_HELP_ORDER PHP_CONFIG_NICE(config.nice)