diff -ruN clapf-0.3.23.orig/bayes.c clapf-0.3.23/bayes.c
--- clapf-0.3.23.orig/bayes.c	2006-02-02 21:07:56.000000000 +0500
+++ clapf-0.3.23/bayes.c	2006-02-18 13:49:32.092046750 +0500
@@ -11,7 +11,7 @@
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <cdb.h>
+#include <tinycdb.h>
 #include <math.h>
 #include <ctype.h>
 #include "misc.h"
diff -ruN clapf-0.3.23.orig/configure clapf-0.3.23/configure
--- clapf-0.3.23.orig/configure	2006-01-27 16:09:29.000000000 +0500
+++ clapf-0.3.23/configure	2006-02-18 13:49:32.096047000 +0500
@@ -3738,7 +3738,7 @@
 
 
 
-for ac_header in cdb.h
+for ac_header in tinycdb.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -3887,13 +3887,13 @@
 
 done
 
-    echo "$as_me:$LINENO: checking for main in -lcdb" >&5
-echo $ECHO_N "checking for main in -lcdb... $ECHO_C" >&6
+    echo "$as_me:$LINENO: checking for main in -ltinycdb" >&5
+echo $ECHO_N "checking for main in -ltinycdb... $ECHO_C" >&6
 if test "${ac_cv_lib_cdb_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcdb  $LIBS"
+LIBS="-ltinycdb  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3946,13 +3946,13 @@
 echo "$as_me:$LINENO: result: $ac_cv_lib_cdb_main" >&5
 echo "${ECHO_T}$ac_cv_lib_cdb_main" >&6
 if test $ac_cv_lib_cdb_main = yes; then
-  echo "$as_me:$LINENO: checking for cdb_find in -lcdb" >&5
-echo $ECHO_N "checking for cdb_find in -lcdb... $ECHO_C" >&6
+  echo "$as_me:$LINENO: checking for cdb_find in -ltinycdb" >&5
+echo $ECHO_N "checking for cdb_find in -ltinycdb... $ECHO_C" >&6
 if test "${ac_cv_lib_cdb_cdb_find+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcdb  $LIBS"
+LIBS="-ltinycdb  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4022,7 +4022,7 @@
 
     have_antispam="yes"
 
-        antispam_libs="-lm -lcdb"
+        antispam_libs="-lm -ltinycdb"
 
     defs="-DHAVE_ANTISPAM"
     objs="hash.o bayes.o decoder.o parser.o"
@@ -4032,7 +4032,7 @@
 
 
 
-for ac_header in mysql.h
+for ac_header in mysql/mysql.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff -ruN clapf-0.3.23.orig/configure.in clapf-0.3.23/configure.in
--- clapf-0.3.23.orig/configure.in	2006-01-27 16:09:29.000000000 +0500
+++ clapf-0.3.23/configure.in	2006-02-18 13:49:32.096047000 +0500
@@ -60,13 +60,13 @@
     AC_HAVE_LIBRARY(m, AC_CHECK_LIB(m, fabs), have_math=yes, ""; exit)
 
     dnl tinycdb
-    AC_CHECK_HEADERS(cdb.h)
-    AC_HAVE_LIBRARY(cdb, AC_CHECK_LIB(cdb, cdb_find, have_tinycdb=yes, echo "you need the tinycdb package"; exit))
+    AC_CHECK_HEADERS(tinycdb.h)
+    AC_HAVE_LIBRARY(tinycdb, AC_CHECK_LIB(cdb, cdb_find, have_tinycdb=yes, echo "you need the tinycdb package"; exit))
 
     have_antispam="yes"
 
-    dnl antispam_libs="-lm -lcrypto -lcdb"
-    antispam_libs="-lm -lcdb"
+    dnl antispam_libs="-lm -lcrypto -ltinycdb"
+    antispam_libs="-lm -ltinycdb"
 
     defs="-DHAVE_ANTISPAM"
     objs="hash.o bayes.o decoder.o parser.o"
diff -ruN clapf-0.3.23.orig/Makefile.in clapf-0.3.23/Makefile.in
--- clapf-0.3.23.orig/Makefile.in	2006-01-27 16:08:33.000000000 +0500
+++ clapf-0.3.23/Makefile.in	2006-02-18 14:54:04.250041500 +0500
@@ -3,6 +3,7 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
+sbindir = @sbindir@
 sysconfdir = @sysconfdir@
 mandir = @mandir@
 
@@ -74,8 +75,8 @@
 
 
 install:
-	$(INSTALL) -d $(DESTDIR)$(bindir)
-	$(INSTALL) -m 0755 clapf $(DESTDIR)$(bindir)
+	$(INSTALL) -d $(DESTDIR)$(sbindir)
+	$(INSTALL) -m 0755 clapf $(DESTDIR)$(sbindir)
 	$(INSTALL) -d $(DESTDIR)$(sysconfdir)
 	$(INSTALL) -m 0644 example.conf $(DESTDIR)$(sysconfdir)/clapf.conf
 	$(INSTALL) -d $(DESTDIR)$(mandir)/man1