diff options
| author | Daniel Black <daniel@mariadb.org> | 2020-09-13 14:09:49 +1000 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 11:27:31 +0200 |
| commit | 1aab7db6c870441046007c792c7fc5ecdff2ea51 (patch) | |
| tree | b94338fffd1f626e203e8e74c14980c8dd86b7b2 | |
| parent | c9abb0c0ac8a9bce1d8d62e45dc3ff9fc9ea5308 (diff) | |
| download | php-git-1aab7db6c870441046007c792c7fc5ecdff2ea51.tar.gz | |
pdo_mysql/mysqli (native) libmysqlclient_r no-longer used
The mysqlclient_r library exists in mysql-5.6 for compatibility only.
Later versions have it removed.
| -rw-r--r-- | ext/mysqli/config.m4 | 3 | ||||
| -rwxr-xr-x | ext/pdo_mysql/config.m4 | 9 |
2 files changed, 2 insertions, 10 deletions
diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4 index 38a130f4cd..7c02546266 100644 --- a/ext/mysqli/config.m4 +++ b/ext/mysqli/config.m4 @@ -57,9 +57,6 @@ elif test "$PHP_MYSQLI" != "no"; then MYSQL_LIB_CFG='--libmysqld-libs' dnl mysqlnd doesn't support embedded, so we have to add some extra stuff mysqli_extra_sources="mysqli_embedded.c" - elif test "$enable_maintainer_zts" = "yes"; then - MYSQL_LIB_CFG='--libs_r' - MYSQL_LIB_NAME='mysqlclient_r' else MYSQL_LIB_CFG='--libs' fi diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4 index 3e37a6adec..7efa814c54 100755 --- a/ext/pdo_mysql/config.m4 +++ b/ext/pdo_mysql/config.m4 @@ -66,13 +66,8 @@ if test "$PHP_PDO_MYSQL" != "no"; then if test "x$SED" = "x"; then AC_PATH_PROG(SED, sed) fi - if test "$enable_maintainer_zts" = "yes"; then - PDO_MYSQL_LIBNAME=mysqlclient_r - PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"` - else - PDO_MYSQL_LIBNAME=mysqlclient - PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"` - fi + PDO_MYSQL_LIBNAME=mysqlclient + PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"` PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"` elif test -n "$PDO_MYSQL_DIR"; then AC_MSG_RESULT([not found]) |