From ac686fa4741515191a1623efc357270772ba6d67 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 18 Aug 2024 00:47:39 +0200 Subject: [PATCH] Autotools: Move AWK finder to PHP_INIT_BUILD_SYSTEM This calls the PHP_PROG_AWK from a single place for php-src build and phpize. --- build/php.m4 | 2 ++ configure.ac | 1 - scripts/phpize.m4 | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build/php.m4 b/build/php.m4 index 3d1b6b1f2516..012b8753f6fd 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -130,6 +130,8 @@ T_MD=$($php_shtool echo -n -e %B) T_ME=$($php_shtool echo -n -e %b) > Makefile.objects > Makefile.fragments +dnl Required programs. +PHP_PROG_AWK dnl Run at the end of the configuration, before creating the config.status. AC_CONFIG_COMMANDS_PRE( [dnl Directory for storing shared objects of extensions. diff --git a/configure.ac b/configure.ac index 0abaf4a4f185..f54b93fdf405 100644 --- a/configure.ac +++ b/configure.ac @@ -152,7 +152,6 @@ dnl Check for -R, etc. switch. PHP_RUNPATH_SWITCH dnl Checks for some support/generator progs. -PHP_PROG_AWK PHP_PROG_BISON([3.0.0]) PHP_PROG_RE2C([1.0.3], [--no-generation-date]) PHP_PROG_PHP() diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 index 22f4477e7bc2..4bfe79dc4575 100644 --- a/scripts/phpize.m4 +++ b/scripts/phpize.m4 @@ -136,9 +136,6 @@ AS_VAR_IF([PHP_DEBUG], [yes], [ dnl Always shared. PHP_BUILD_SHARED -dnl Required programs. -PHP_PROG_AWK - PHP_HELP_SEPARATOR([Extension:]) PHP_CONFIGURE_PART([Configuring extension])