Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
5df5a00c58 |
@ -24,11 +24,12 @@ endif()
|
|||||||
|
|
||||||
find_package(PkgConfig)
|
find_package(PkgConfig)
|
||||||
if(PKG_CONFIG_FOUND)
|
if(PKG_CONFIG_FOUND)
|
||||||
pkg_search_module(PHP php7)
|
pkg_search_module(PHP php8 php7)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT PHP_FOUND)
|
if(NOT PHP_FOUND)
|
||||||
find_program(PHP_CONFIG_EXECUTABLE NAMES
|
find_program(PHP_CONFIG_EXECUTABLE NAMES
|
||||||
|
php-config8.0 php-config80
|
||||||
php-config7.4 php-config74
|
php-config7.4 php-config74
|
||||||
php-config7.3 php-config73
|
php-config7.3 php-config73
|
||||||
php-config7.2 php-config72
|
php-config7.2 php-config72
|
||||||
@ -41,9 +42,9 @@ if(NOT PHP_FOUND)
|
|||||||
execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --includes OUTPUT_VARIABLE PHP_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
|
execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --includes OUTPUT_VARIABLE PHP_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --libs OUTPUT_VARIABLE PHP_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
|
execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --libs OUTPUT_VARIABLE PHP_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --version OUTPUT_VARIABLE PHP_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
|
execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --version OUTPUT_VARIABLE PHP_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
if(${PHP_VERSION} MATCHES "^7")
|
if(${PHP_VERSION} MATCHES "^[78]")
|
||||||
find_library(PHP_LIB
|
find_library(PHP_LIB
|
||||||
NAMES php7.4 php7.3 php7.2 php7.1 php7.0 php7
|
NAMES php8.0 php7.4 php7.3 php7.2 php7.1 php7.0 php7
|
||||||
HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64
|
HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64
|
||||||
)
|
)
|
||||||
if(PHP_LIB)
|
if(PHP_LIB)
|
||||||
|
@ -119,7 +119,7 @@ API_FUNC(register)
|
|||||||
php_registered_script->name);
|
php_registered_script->name);
|
||||||
API_RETURN_ERROR;
|
API_RETURN_ERROR;
|
||||||
}
|
}
|
||||||
if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, "SSSSSzS",
|
if (zend_parse_parameters (ZEND_NUM_ARGS(), "SSSSSzS",
|
||||||
&name, &author, &version, &license, &description,
|
&name, &author, &version, &license, &description,
|
||||||
&shutdown_func, &charset) == FAILURE)
|
&shutdown_func, &charset) == FAILURE)
|
||||||
{
|
{
|
||||||
|
@ -1246,8 +1246,18 @@ php_weechat_sapi_error (int type, const char *format, ...)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if PHP_VERSION_ID >= 70100
|
#if PHP_VERSION_ID >= 80000
|
||||||
/* PHP >= 7.1 */
|
/* PHP >= 8.0 */
|
||||||
|
void
|
||||||
|
php_weechat_log_message (const char *message, int syslog_type_int)
|
||||||
|
{
|
||||||
|
/* make C compiler happy */
|
||||||
|
(void) syslog_type_int;
|
||||||
|
|
||||||
|
php_weechat_ub_write (message, strlen (message));
|
||||||
|
}
|
||||||
|
#elif PHP_VERSION_ID >= 70100
|
||||||
|
/* 7.1 <= PHP < 8.0 */
|
||||||
void
|
void
|
||||||
php_weechat_log_message (char *message, int syslog_type_int)
|
php_weechat_log_message (char *message, int syslog_type_int)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user