Author: Robie Basak <robie.basak@canonical.com>
Bug-Ubuntu: https://launchpad.net/bugs/1564871
Forwarded: no
Last-Update: 2016-04-01
Description: use libmysqlclient instead of libmysqlclient_r
 The former supersedes the latter which no longer exists in MySQL 5.7. Patch
 both the m4 macro and the configure script directly since autoreconf fails
 (some m4 macros missing from the source tree?)

--- a/config/mysql_loc.m4
+++ b/config/mysql_loc.m4
@@ -35,7 +35,7 @@
 	#
 	if test "x$acx_pthread_ok" = xyes
 	then
-		MYSQL_C_LIB_NAME=mysqlclient_r
+		MYSQL_C_LIB_NAME=mysqlclient
 	else
 		MYSQL_C_LIB_NAME=mysqlclient
 	fi
--- a/configure
+++ b/configure
@@ -12195,7 +12195,7 @@
 	#
 	if test "x$acx_pthread_ok" = xyes
 	then
-		MYSQL_C_LIB_NAME=mysqlclient_r
+		MYSQL_C_LIB_NAME=mysqlclient
 	else
 		MYSQL_C_LIB_NAME=mysqlclient
 	fi
