Author: Robie Basak <robie.basak@canonical.com>
Bug-Ubuntu: https://launchpad.net/bugs/1564871
Forwarded: no
Last-Update: 2016-04-01

--- a/configure.ac
+++ b/configure.ac
@@ -203,7 +203,7 @@
 # ****************** MySQL Checks ***********************
 
 AC_DEFUN([MYSQL_LIB_CHK],
-  [ str="$1/libmysqlclient_r.*"
+  [ str="$1/libmysqlclient.*"
     for j in `echo $str`; do
       if test -r $j; then
         MYSQL_LIB_DIR=$1
@@ -240,11 +240,11 @@
 fi
 CFLAGS="-I$MYSQL_INC_DIR $CFLAGS"
 
-AC_CHECK_LIB(mysqlclient_r,mysql_init, LIBS="-lmysqlclient_r $LIBS",
+AC_CHECK_LIB(mysqlclient,mysql_init, LIBS="-lmysqlclient $LIBS",
   AC_MSG_ERROR([MySQL libraries not found])
 )
 
-AC_CHECK_LIB(mysqlclient_r,mysql_thread_init,[],
+AC_CHECK_LIB(mysqlclient,mysql_thread_init,[],
   AC_DEFINE(OLD_MYSQL, 1, [Old MySQL version])
 )
 
