From 8a9b6c1554e86d85250bea0ddf4430c858cf144f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sun, 22 Mar 2020 10:58:09 +0100 Subject: [PATCH] php: add detection of PHP 7.4 in autotools Support of PHP 7.4 was added for CMake (in commit 72b107a970a7bed13da040be4515761ddbb1cbb4) but was still missing in autotools. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index e4c55d0d3..ea415eb81 100644 --- a/configure.ac +++ b/configure.ac @@ -852,7 +852,7 @@ if test "x$enable_php" = "xyes" ; then if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then AC_MSG_CHECKING(for PHP headers and libraries with pkg-config) echo - for l in "7.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do + for l in "7.4" "74" "7.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do pkgconfig_php_found=`$PKGCONFIG --exists php$l 2>/dev/null` if test "x$?" = "x0" ; then pkgconfig_php_found=`$PKGCONFIG --atleast-version=7 php$l 2>/dev/null` @@ -869,7 +869,7 @@ if test "x$enable_php" = "xyes" ; then if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then PHPCONFIG="" AC_MSG_CHECKING(for PHP headers and libraries with php-config) - for l in "7.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do + for l in "7.4" "74" "7.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do AC_CHECK_PROG(PHPCONFIG, "php-config$l", "php-config$l") if test "x$PHPCONFIG" != "x" ; then php_config_version=`$PHPCONFIG --version` @@ -890,7 +890,7 @@ if test "x$enable_php" = "xyes" ; then if test "x$ac_found_php_header" = "xyes" ; then PHP_CFLAGS="$CFLAGS" fi - for l in "7.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do + for l in "7.4" "74" "7.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do AC_CHECK_LIB(php$l,php_execute_script,ac_found_php_lib="yes",ac_found_php_lib="no") if test "x$ac_found_php_lib" = "xyes" ; then PHP_VERSION=">=7.0.0"