--- apr-util-1.2.8/build/dbd.m4.orig	2007-01-03 15:34:15.000000000 +0000
+++ apr-util-1.2.8/build/dbd.m4	2007-01-03 15:34:19.000000000 +0000
@@ -97,8 +97,8 @@
           AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
         else
           if test "x$MYSQL_CONFIG" != 'x'; then
-            APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
-            APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS])
+            APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql])
+            APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
           fi
         fi
 
@@ -125,8 +125,8 @@
         AC_MSG_NOTICE(checking for mysql in $withval)
         AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
         if test "$apu_have_mysql" != "0"; then
-          APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
-          APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS])
+          APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql])
+          APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
         fi
 
         if test "$apu_have_mysql" != "1"; then