Skip to content

Commit 1aab7db

Browse files
grooverdannikic
authored andcommitted
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.
1 parent c9abb0c commit 1aab7db

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

ext/mysqli/config.m4

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ elif test "$PHP_MYSQLI" != "no"; then
5757
MYSQL_LIB_CFG='--libmysqld-libs'
5858
dnl mysqlnd doesn't support embedded, so we have to add some extra stuff
5959
mysqli_extra_sources="mysqli_embedded.c"
60-
elif test "$enable_maintainer_zts" = "yes"; then
61-
MYSQL_LIB_CFG='--libs_r'
62-
MYSQL_LIB_NAME='mysqlclient_r'
6360
else
6461
MYSQL_LIB_CFG='--libs'
6562
fi

ext/pdo_mysql/config.m4

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,8 @@ if test "$PHP_PDO_MYSQL" != "no"; then
6666
if test "x$SED" = "x"; then
6767
AC_PATH_PROG(SED, sed)
6868
fi
69-
if test "$enable_maintainer_zts" = "yes"; then
70-
PDO_MYSQL_LIBNAME=mysqlclient_r
71-
PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"`
72-
else
73-
PDO_MYSQL_LIBNAME=mysqlclient
74-
PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"`
75-
fi
69+
PDO_MYSQL_LIBNAME=mysqlclient
70+
PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"`
7671
PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
7772
elif test -n "$PDO_MYSQL_DIR"; then
7873
AC_MSG_RESULT([not found])

0 commit comments

Comments
 (0)