blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

php: add detection of PHP 7.4 in autotools

Browse Source 
Support of PHP 7.4 was added for CMake (in commit
72b107a970a7bed13da040be4515761ddbb1cbb4) but was still missing in autotools.
This commit is contained in:
Sébastien Helleu 2020-03-22 10:58:09 +01:00
parent 5ca64fc389
commit 8a9b6c1554
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -852,7 +852,7 @@ if test "x$enable_php" = "xyes" ; then
if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then
AC_MSG_CHECKING(for PHP headers and libraries with pkg-config) AC_MSG_CHECKING(for PHP headers and libraries with pkg-config)
echo 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` pkgconfig_php_found=`$PKGCONFIG --exists php$l 2>/dev/null`
if test "x$?" = "x0" ; then if test "x$?" = "x0" ; then
pkgconfig_php_found=`$PKGCONFIG --atleast-version=7 php$l 2>/dev/null` 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 if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then
PHPCONFIG="" PHPCONFIG=""
AC_MSG_CHECKING(for PHP headers and libraries with php-config) 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") AC_CHECK_PROG(PHPCONFIG, "php-config$l", "php-config$l")
if test "x$PHPCONFIG" != "x" ; then if test "x$PHPCONFIG" != "x" ; then
php_config_version=`$PHPCONFIG --version` 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 if test "x$ac_found_php_header" = "xyes" ; then
PHP_CFLAGS="$CFLAGS" PHP_CFLAGS="$CFLAGS"
fi 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") 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 if test "x$ac_found_php_lib" = "xyes" ; then
PHP_VERSION=">=7.0.0" PHP_VERSION=">=7.0.0"