Index: build/dbd.m4
===================================================================
--- build/dbd.m4	(revision 390755)
+++ build/dbd.m4	(working copy)
@@ -88,22 +88,37 @@
       apu_have_mysql=0
     else
       CPPFLAGS="-I$withval/include"
-      LDFLAGS="-L$withval/lib "
+      LDFLAGS="-L$withval/lib"
 
       AC_MSG_NOTICE(checking for mysql in $withval)
-      AC_CHECK_HEADER(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
-      if test "$apu_have_mysql" != "0"; then
-        APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-        APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
+      AC_CHECK_HEADER(mysql.h, [apu_have_mysql_header=1])
+      if test "$apu_have_mysql_header" != "1"; then
+        AC_CHECK_HEADER(mysql/mysql.h, [apu_have_mysql_header=1])
+        if test "$apu_have_mysql_header" != "0"; then
+          apu_mysql_include=[-I$withval/include/mysql]
+        fi
+      else
+        apu_mysql_include=[-I$withval/include/]
       fi
 
-      if test "$apu_have_mysql" != "1"; then
-        AC_CHECK_HEADER(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
-        if test "$apu_have_mysql" != "0"; then
-          APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql])
-          APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
+      AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql_lib=1])
+      if test "$apu_have_mysql_lib" != "1"; then
+        LDFLAGS="-L$withval/lib/mysql"
+        AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql_lib=1])
+        if test "$apu_have_mysql_lib" != "0"; then
+          apu_mysql_lib=[-L$withval/lib/mysql]
         fi
+      else
+        apu_mysql_lib=[-L$withval/lib]
       fi
+
+      if test "$apu_have_mysql_header" != "0"; then
+        if test "$apu_have_mysql_lib" != "0"; then
+          apu_have_mysql=1
+          APR_ADDTO(APRUTIL_LDFLAGS, $apu_mysql_lib)
+          APR_ADDTO(APRUTIL_INCLUDES, $apu_mysql_include)
+        fi
+      fi
     fi
   ], [
     apu_have_mysql=0