diff options
| author | Nick Kew <niq@apache.org> | 2017-04-02 16:27:10 +0000 |
|---|---|---|
| committer | Nick Kew <niq@apache.org> | 2017-04-02 16:27:10 +0000 |
| commit | e20d3d3a2017d7086bde19814cdf8ef93da92f34 (patch) | |
| tree | 7eac3afc81b46b04d761d105dab9c3ea1c57afe4 /build | |
| parent | b6ad9fc400f437eb2dac00e75508c7ef27d979aa (diff) | |
| download | apr-e20d3d3a2017d7086bde19814cdf8ef93da92f34.tar.gz | |
PR#59927: build apu with modern MySQL.
Patch: Petr Sumbera
Following the comments on the PR, it seems mysqlclient_r has been
superfluous since MySQL 5.5 in 2010
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1789894 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/dbd.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build/dbd.m4 b/build/dbd.m4 index 3ae967992..77e3af10a 100644 --- a/build/dbd.m4 +++ b/build/dbd.m4 @@ -177,12 +177,12 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ fi AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], - AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]), + AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), [apu_have_mysql=0; break], [#include <my_global.h>]) if test "$apu_have_mysql" = "0"; then AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], - AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]), + AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), [apu_have_mysql=0; break], [#include <mysql/my_global.h>]) fi @@ -208,13 +208,13 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ AC_MSG_NOTICE(checking for mysql in $withval) AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], - AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]), + AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), [apu_have_mysql=0; break], [#include <my_global.h>]) if test "$apu_have_mysql" != "1"; then AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], - AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]), + AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), [apu_have_mysql=0; break], [#include <mysql/my_global.h>]) fi @@ -229,7 +229,7 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ dnl Since we have already done the AC_CHECK_LIB tests, if we have it, dnl we know the library is there. if test "$apu_have_mysql" = "1"; then - APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient_r $mysql_LIBS]) + APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient $mysql_LIBS]) fi AC_SUBST(LDADD_dbd_mysql) |