diff options
| -rw-r--r-- | build/dbd.m4 | 20 | ||||
| -rw-r--r-- | dbd/apr_dbd_mysql.c | 10 |
2 files changed, 26 insertions, 4 deletions
diff --git a/build/dbd.m4 b/build/dbd.m4 index 5f943dfb..bb0e424f 100644 --- a/build/dbd.m4 +++ b/build/dbd.m4 @@ -176,9 +176,15 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ APR_ADDTO(LIBS, [$mysql_LIBS]) fi - AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], + AC_CHECK_LIB(mysqlclient_r, 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, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + 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]), + [apu_have_mysql=0; break], + [#include <mysql/my_global.h>]) fi if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) @@ -201,10 +207,16 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ APR_ADDTO(LIBS, [$mysql_LIBS]) AC_MSG_NOTICE(checking for mysql in $withval) - AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], + AC_CHECK_LIB(mysqlclient_r, 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, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + 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]), + [apu_have_mysql=0; break], + [#include <mysql/my_global.h>]) fi if test "$apu_have_mysql" != "0"; then APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) diff --git a/dbd/apr_dbd_mysql.c b/dbd/apr_dbd_mysql.c index ec1d4e23..77fa5fb7 100644 --- a/dbd/apr_dbd_mysql.c +++ b/dbd/apr_dbd_mysql.c @@ -25,6 +25,16 @@ #include <ctype.h> #include <stdlib.h> +#ifdef HAVE_MY_GLOBAL_H +#include <my_global.h> +#elif defined(HAVE_MYSQL_MY_GLOBAL_H) +#include <mysql/my_global.h> +#endif +#ifdef HAVE_MY_SYS_H +#include <my_sys.h> +#elif defined(HAVE_MYSQL_MY_SYS_H) +#include <mysql/my_sys.h> +#endif #ifdef HAVE_MYSQL_H #include <mysql.h> #include <errmsg.h> |