Index: configure
--- configure.orig	2007-07-14 11:56:54 +0200
+++ configure	2007-08-03 22:38:16 +0200
@@ -2620,19 +2620,19 @@
   withval=$with_pkglibdir; pkglibdirname="$withval"
 fi
 
-  if test "x$pkglibdirname" = "x"
+  if false
   then
   	DM_PKGLIBDIR="/usr/lib/dbmail"
   else
   	DM_PKGLIBDIR=$pkglibdirname
   fi
-  if test "x$localstatedir" = 'x${prefix}/var'
+  if false
   then
   	DM_STATEDIR="/var/run"
   else
   	DM_STATEDIR=$localstatedir
   fi
-  if test "x$sysconfdir" = 'x${prefix}/etc'
+  if false
   then
   	DM_CONFDIR="/etc"
   else
Index: debug.c
--- debug.c.orig	2007-07-14 11:56:54 +0200
+++ debug.c	2007-08-03 22:38:16 +0200
@@ -23,7 +23,7 @@
  * Debugging and memory checking functions */
 
 #include "dbmail.h"
-#if defined(BSD4_4)
+#if defined(__FreeBSD__) || defined(BSD4_4)
 extern char     *__progname;            /* Program name, from crt0. */
 #else
 char            *__progname = NULL;
Index: modules/dbsqlite.c
--- modules/dbsqlite.c.orig	2007-07-14 11:56:54 +0200
+++ modules/dbsqlite.c	2007-08-03 22:40:59 +0200
@@ -36,7 +36,7 @@
 /* SQLITE3 internals... */
 extern int sqlite3ReadUtf8(const unsigned char *);
 extern const unsigned char sqlite3UpperToLower[];
-extern int sqlite3utf8CharLen(const char *pData, int nByte);
+extern int sqlite3Utf8CharLen(const char *pData, int nByte);
 
 const char * db_get_sql(sql_fragment_t frag)
 {
@@ -106,7 +106,7 @@
 static void dbsqlite_current_timestamp_unix(sqlite3_context *f, int argc UNUSED,  const sqlite3_value **argv UNUSED)
 {
 	char buf[63];
-	sprintf(buf, "%ld", time(NULL)); /* assumes time() is signed int */
+	sprintf(buf, "%ld", (long)time(NULL)); /* assumes time() is signed int */
 	(void)sqlite3_result_text(f,buf,-1,SQLITE_TRANSIENT);
 }
 
@@ -236,7 +236,7 @@
 		** Otherwise, return an error.
 		*/
 		const unsigned char *zEsc = sqlite3_value_text(argv[2]);
-		if (sqlite3utf8CharLen((const char *)zEsc, -1) != 1) {
+		if (sqlite3Utf8CharLen((const char *)zEsc, -1) != 1) {
 			sqlite3_result_error(context, 
 				"ESCAPE expression must be a single character", -1);
 			return;