Author: Robie Basak <robie.basak@canonical.com>
Description: use libmysqlclient instead of libmysqlclient_r
 The former supersedes the latter which no longer exists in MySQL 5.7.
Forwarded: no
Last-Update: 2016-04-14

---
 acinclude.m4 |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- a/acinclude.m4
+++ b/acinclude.m4
@@ -51,7 +51,7 @@ then
     ac_cv_mysql_libs=`echo ${ac_cv_mysql_libs} | sed -e 's/.libs$//' \
                       -e 's+.libs/$++'`
     AC_CACHE_CHECK([MySQL libraries], [ac_cv_mysql_libs], [ac_cv_mysql_libs=""])
-    MYSQL_LIBS="-L$ac_cv_mysql_libs -lmysqlclient_r"
+    MYSQL_LIBS="-L$ac_cv_mysql_libs -lmysqlclient"
 fi
 
 # If some path is missing, try to autodetermine with mysql_config
@@ -82,8 +82,7 @@ ERROR: cannot find MySQL libraries. If y
         if test [ -z "$ac_cv_mysql_libs" ]
         then
             AC_MSG_CHECKING(MySQL linker flags)
-            MYSQL_LIBS=`${mysqlconfig} --libs | sed -e \
-            's/-lmysqlclient /-lmysqlclient_r /' -e 's/-lmysqlclient$/-lmysqlclient_r/'`
+            MYSQL_LIBS=`${mysqlconfig} --libs`
             AC_MSG_RESULT($MYSQL_LIBS)
         fi
     fi
