archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Autotools: Refactor mysqli extension checks (#15323)

Browse source 
- AS_* macros used
- s/UNIX/Unix
- The --with-mysql result value moved into the check when extension is
  enabled
- List of source files normalized with m4_normalize
- Redundant variables omitted
- CS synced
This commit is contained in:
Peter Kokot 2024-08-10 10:08:17 +02:00 • committed by GitHub
parent dbdc79df95
commit fcd4d391fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

63
ext/mysqli/config.m4
View file

@ -17,13 +17,11 @@ AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
fi fi
done done
if test -n "$MYSQL_SOCK"; then AS_VAR_IF([MYSQL_SOCK],, [AC_MSG_RESULT([no])], [
AC_DEFINE_UNQUOTED([PHP_MYSQL_UNIX_SOCK_ADDR], ["$MYSQL_SOCK"], AC_DEFINE_UNQUOTED([PHP_MYSQL_UNIX_SOCK_ADDR], ["$MYSQL_SOCK"],
[The MySQL Unix socket location.]) [The MySQL Unix socket location.])
AC_MSG_RESULT([$MYSQL_SOCK]) AC_MSG_RESULT([$MYSQL_SOCK])
else ])
AC_MSG_RESULT([no])
fi
]) ])
PHP_ARG_WITH([mysqli], PHP_ARG_WITH([mysqli],
@ -33,39 +31,42 @@ PHP_ARG_WITH([mysqli],
dnl ext/pdo_mysql/config.m4 also depends on this configure option. dnl ext/pdo_mysql/config.m4 also depends on this configure option.
PHP_ARG_WITH([mysql-sock], PHP_ARG_WITH([mysql-sock],
[for specified location of the MySQL UNIX socket], [for specified location of the MySQL Unix socket],
[AS_HELP_STRING([[--with-mysql-sock[=SOCKPATH]]], [AS_HELP_STRING([[--with-mysql-sock[=SOCKPATH]]],
[MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer. If unspecified, [MySQLi/PDO_MYSQL: Location of the MySQL Unix socket pointer. If
the default locations are searched])], unspecified, the default locations are searched])],
[no], [no],
[no]) [no])
if test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" = "mysqlnd"; then
dnl This needs to be set in any extension which wishes to use mysqlnd
PHP_MYSQLND_ENABLED=yes
elif test "$PHP_MYSQLI" != "no"; then
AC_MSG_ERROR([Linking mysqli against external library is no longer supported])
fi
dnl Build extension
if test "$PHP_MYSQLI" != "no"; then if test "$PHP_MYSQLI" != "no"; then
AC_MSG_CHECKING([for MySQL UNIX socket location]) dnl The PHP_MYSQLND_ENABLED variable enables the mysqlnd extension.
if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then AS_CASE([$PHP_MYSQLI],
MYSQL_SOCK=$PHP_MYSQL_SOCK [yes|mysqlnd], [PHP_MYSQLND_ENABLED=yes],
AC_DEFINE_UNQUOTED([PHP_MYSQL_UNIX_SOCK_ADDR], ["$MYSQL_SOCK"]) [AC_MSG_ERROR(m4_text_wrap([
AC_MSG_RESULT([$MYSQL_SOCK]) Linking mysqli against external library is no longer supported. Replace
elif test "$PHP_MYSQL_SOCK" = "yes"; then '--with-mysqli=$PHP_MYSQLI' with '--with-mysqli'.
PHP_MYSQL_SOCKET_SEARCH ]))])
else
AC_MSG_RESULT([no])
fi
mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \ AC_MSG_CHECKING([for MySQL Unix socket location])
mysqli_report.c mysqli_driver.c mysqli_warning.c \ AS_CASE([$PHP_MYSQL_SOCK],
mysqli_exception.c mysqli_result_iterator.c" [yes], [PHP_MYSQL_SOCKET_SEARCH],
PHP_NEW_EXTENSION([mysqli], [no], [AC_MSG_RESULT([no])],
[$mysqli_sources], [
AC_DEFINE_UNQUOTED([PHP_MYSQL_UNIX_SOCK_ADDR], ["$PHP_MYSQL_SOCK"])
AC_MSG_RESULT([$PHP_MYSQL_SOCK])
])
PHP_NEW_EXTENSION([mysqli], m4_normalize([
mysqli_api.c
mysqli_driver.c
mysqli_exception.c
mysqli_nonapi.c
mysqli_prop.c
mysqli_report.c
mysqli_result_iterator.c
mysqli_warning.c
mysqli.c
]),
[$ext_shared],, [$ext_shared],,
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1]) [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
PHP_INSTALL_HEADERS([ext/mysqli], [php_mysqli_structs.h mysqli_mysqlnd.h]) PHP_INSTALL_HEADERS([ext/mysqli], [php_mysqli_structs.h mysqli_mysqlnd.h])