25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
|
Index: apr-util-1.6.1/build/dbd.m4
|
||
|
|
===================================================================
|
||
|
|
--- apr-util-1.6.1.orig/build/dbd.m4
|
||
|
|
+++ apr-util-1.6.1/build/dbd.m4
|
||
|
|
@@ -176,15 +176,13 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
|
||
|
|
APR_ADDTO(LIBS, [$mysql_LIBS])
|
||
|
|
fi
|
||
|
|
|
||
|
|
- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
|
||
|
|
+ AC_CHECK_HEADERS([mysql.h],
|
||
|
|
AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
|
||
|
|
- [apu_have_mysql=0; break],
|
||
|
|
- [#include <my_global.h>])
|
||
|
|
+ [apu_have_mysql=0; break])
|
||
|
|
if test "$apu_have_mysql" = "0"; then
|
||
|
|
- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
|
||
|
|
+ AC_CHECK_HEADERS([mysql/mysql.h],
|
||
|
|
AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
|
||
|
|
- [apu_have_mysql=0; break],
|
||
|
|
- [#include <mysql/my_global.h>])
|
||
|
|
+ [apu_have_mysql=0; break])
|
||
|
|
fi
|
||
|
|
if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then
|
||
|
|
APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
|