View | Details | Raw Unified | Return to bug 230538 | Differences between
and this patch

Collapse All | Expand All

(-)apr-util-1.6.1/build/dbd.m4 (-2 / +2 lines)
Lines 190-196 Link Here
190
	AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
190
	AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
191
      fi
191
      fi
192
      if test "$apr_have_mysql" = "1"; then
192
      if test "$apr_have_mysql" = "1"; then
193
	AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
193
#	AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
194
	AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
194
	AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
195
      fi
195
      fi
196
      if test "$apu_have_mysql" = "1" && test "x$MYSQL_CONFIG" != 'x'; then
196
      if test "$apu_have_mysql" = "1" && test "x$MYSQL_CONFIG" != 'x'; then
Lines 225-231 Link Here
225
	AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
225
	AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
226
      fi
226
      fi
227
      if test "$apr_have_mysql" = "1"; then
227
      if test "$apr_have_mysql" = "1"; then
228
	AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
228
#	AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
229
	AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
229
	AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
230
      fi
230
      fi
231
      if test "$apu_have_mysql" = "1"; then
231
      if test "$apu_have_mysql" = "1"; then
(-)apr-util-1.6.1/dbd/apr_dbd_mysql.c (+5 lines)
Lines 16-21 Link Here
16
16
17
#include "apu.h"
17
#include "apu.h"
18
18
19
#ifndef HAVE_TYPE_MY_BOOL
20
#include <stdbool.h>
21
typedef bool my_bool;
22
#endif
23
19
#if APU_HAVE_MYSQL
24
#if APU_HAVE_MYSQL
20
25
21
#include "apu_version.h"
26
#include "apu_version.h"

Return to bug 230538