diff -Naur mydns-1.1.0.orig/m4/mydns.m4 mydns-1.1.0/m4/mydns.m4
--- mydns-1.1.0.orig/m4/mydns.m4	2006-01-19 07:08:14.000000000 +0900
+++ mydns-1.1.0/m4/mydns.m4	2006-01-22 13:09:39.000000000 +0900
@@ -517,47 +517,10 @@
 ##
 AC_DEFUN([AC_LIB_MYSQLCLIENT],
 	[
-		libmysqlclient_dirs="/usr/local/mysql/lib /usr/local/lib/mysql /usr/local/lib /usr/lib/mysql /usr/lib /lib"
-		AC_ARG_WITH(mysql-lib,
-			AC_HELP_STRING([--with-mysql-lib=DIR], [look for the MySQL client library in DIR]),
-			libmysqlclient_dirs="$withval $libmysqlclient_dirs")
-		libmysqlclient_found=no, libmysqlclient_ok=no
-		for libmysqlclient_dir in $libmysqlclient_dirs; do
-			if test "$libmysqlclient_found" != yes; then
-				AC_CHECK_FILE($libmysqlclient_dir/libmysqlclient.a, libmysqlclient_found=yes, libmysqlclient_found=no)
-				if test "$libmysqlclient_found" != yes; then
-					AC_CHECK_FILE($libmysqlclient_dir/libmysqlclient.so.10, libmysqlclient_found=yes, libmysqlclient_found=no)
-				fi
-				if test "$libmysqlclient_found" != yes; then
-					AC_CHECK_FILE($libmysqlclient_dir/libmysqlclient.so.12, libmysqlclient_found=yes, libmysqlclient_found=no)
-				fi
-				if test "$libmysqlclient_found" = yes; then
-					## libmysqlclient depends on libz
-					if ! test -n "$LIBZ"; then
-						AC_LIB_Z
-					fi
-					if ! test -n "$LIBZ"; then
-						## No zlib
-						AC_MSG_ERROR([
-
-][  ###
-][  ###  zlib compression library (libz.a) not found.
-][  ###
-][  ###  Please download and install the zlib compression
-][  ###  library from the following URL:
-][  ###
-][  ###       http://www.gzip.org/zlib/
-][  ###
-][  ###  (Error detail might be available in `config.log')
-][  ###
-])
-     				fi
-					LIBMYSQLCLIENT="-L$libmysqlclient_dir -lmysqlclient"
-					#LIBMYSQLCLIENT="$libmysqlclient_dir/libmysqlclient.a"
-					libmysqlclient_found=yes
-				fi
-			fi
-		done
+		AC_CHECK_PROG(LIBMYSQLCLIENT,mysql_config,`mysql_config --libs`)
+		if test -z "$LIBMYSQLCLIENT"; then
+			AC_MSG_ERROR([Could not find mysql_config script. Make sure the mysql client libraries are installed])
+		fi
 		AC_SUBST(LIBMYSQLCLIENT)
 	]
 )
@@ -567,21 +530,10 @@
 ##
 AC_DEFUN([AC_HEADER_MYSQL],
 	[
-		ac_mydns_header_dirs="/usr/include /usr/include/mysql /usr/local/include \
-									 /usr/local/include/mysql /usr/local/mysql/include"
-		ac_mydns_header_found=no, ac_mydns_header_ok=no
-		AC_ARG_WITH(mysql-include,
-			AC_HELP_STRING([--with-mysql-include=DIR],
-								[look for MySQL include files in DIR]),
-			ac_mydns_header_dirs="$withval $ac_mydns_header_dirs")
-		for dir in $ac_mydns_header_dirs
-		do
-			if test "$ac_mydns_header_found" != yes
-			then
-				AC_CHECK_FILE($dir/mysql.h, ac_mydns_header_found=yes, ac_mydns_header_found=no)
-				test "$ac_mydns_header_found" = yes && MYSQL_INCLUDE="-I$dir"
-			fi
-		done
+		AC_CHECK_PROG(MYSQL_INCLUDE,mysql_config,`mysql_config --include`)
+		if test -z "$MYSQL_INCLUDE"; then
+			AC_MSG_ERROR([Could not find mysql_config script. Make sure the mysql headers are installed])
+		fi
 		AC_SUBST(MYSQL_INCLUDE)
 	]
 )