diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2018-10-16 23:02:13 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2018-10-16 23:02:13 +0200 |
| commit | e7cb025e68cd43908cb22a92f51c056aeb36a104 (patch) | |
| tree | 8489702ef63e086f0b5895f36c525de80cbcc5b3 | |
| parent | 9bc9b4c86b89310674866b875a306bd9d5aff467 (diff) | |
| download | weechat-e7cb025e68cd43908cb22a92f51c056aeb36a104.zip | |
php: add detection of PHP 7.3
| -rw-r--r-- | ChangeLog.adoc | 4 | ||||
| -rw-r--r-- | cmake/FindPHP.cmake | 3 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 5dc914aac..31115c42d 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -48,6 +48,10 @@ Tests:: * unit: add tests on line and hook functions +Build:: + + * php: add detection of PHP 7.3 + [[v2.2]] == Version 2.2 (2018-07-14) diff --git a/cmake/FindPHP.cmake b/cmake/FindPHP.cmake index 444184a13..070d881e0 100644 --- a/cmake/FindPHP.cmake +++ b/cmake/FindPHP.cmake @@ -28,6 +28,7 @@ endif() if(NOT PHP_FOUND) find_program(PHP_CONFIG_EXECUTABLE NAMES + php-config7.3 php-config73 php-config7.2 php-config72 php-config7.1 php-config71 php-config7.0 php-config70 @@ -39,7 +40,7 @@ if(NOT PHP_FOUND) execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --version OUTPUT_VARIABLE PHP_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) if(${PHP_VERSION} MATCHES "^7") find_library(PHP_LIB - NAMES php7.2 php7.1 php7.0 php7 + NAMES php7.3 php7.2 php7.1 php7.0 php7 HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64) if(PHP_LIB) get_filename_component(PHP_LIB_DIR ${PHP_LIB} DIRECTORY) diff --git a/configure.ac b/configure.ac index 0d908e83b..d267ca10f 100644 --- a/configure.ac +++ b/configure.ac @@ -968,7 +968,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.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do + for l in "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` @@ -985,7 +985,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.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do + for l in "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` @@ -1006,7 +1006,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.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do + for l in "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" |