]>
Commit | Line | Data |
---|---|---|
9b878495 JR |
1 | --- sysbench-0.4.12/acinclude.m4~ 2009-03-14 14:35:36.000000000 +0100 |
2 | +++ sysbench-0.4.12/acinclude.m4 2018-03-10 23:19:19.161781346 +0100 | |
3 | @@ -1,9 +1,7 @@ | |
4 | dnl --------------------------------------------------------------------------- | |
5 | dnl Macro: AC_CHECK_MYSQLR | |
6 | dnl First check for custom MySQL paths in --with-mysql-* options. | |
7 | -dnl If some paths are missing, check if mysql_config exists. | |
8 | -dnl Then check for the libraries and replace -lmysqlclient with | |
9 | -dnl -lmysqlclient_r, to enable threaded client library. | |
10 | +dnl If some paths are missing, check if mysql_config exists. | |
11 | dnl --------------------------------------------------------------------------- | |
12 | ||
13 | AC_DEFUN([AC_CHECK_MYSQLR],[ | |
14 | @@ -51,7 +49,7 @@ | |
15 | ac_cv_mysql_libs=`echo ${ac_cv_mysql_libs} | sed -e 's/.libs$//' \ | |
16 | -e 's+.libs/$++'` | |
17 | AC_CACHE_CHECK([MySQL libraries], [ac_cv_mysql_libs], [ac_cv_mysql_libs=""]) | |
18 | - MYSQL_LIBS="-L$ac_cv_mysql_libs -lmysqlclient_r" | |
19 | + MYSQL_LIBS="-L$ac_cv_mysql_libs -lmysqlclient" | |
20 | fi | |
21 | ||
22 | # If some path is missing, try to autodetermine with mysql_config | |
23 | @@ -82,8 +80,7 @@ | |
24 | if test [ -z "$ac_cv_mysql_libs" ] | |
25 | then | |
26 | AC_MSG_CHECKING(MySQL linker flags) | |
27 | - MYSQL_LIBS=`${mysqlconfig} --libs | sed -e \ | |
28 | - 's/-lmysqlclient /-lmysqlclient_r /' -e 's/-lmysqlclient$/-lmysqlclient_r/'` | |
29 | + MYSQL_LIBS=`${mysqlconfig} --libs` | |
30 | AC_MSG_RESULT($MYSQL_LIBS) | |
31 | fi | |
32 | fi |