Cyrus 2.3.9 RC1

[Hajimu UMEMOTO]

Hi,

>>>>> On Fri, 10 Aug 2007 13:29:26 -0400
>>>>> Ken Murchison <murch at andrew.cmu.edu> said:

murch> I just put together a release candidate for Cyrus 2.3.9.  I'd appreciate 
murch> any independent testing before I release this to the masses.

murch> If there are any outstanding issues that you believe still need to be 
murch> addressed in 2.3.9, please let me know.

murch> http://www.contrib.andrew.cmu.edu/~murch/cyrus-imapd-2.3.9rc1.tar.gz

Could you apply the following patch?  The patch does the following
things:

- DB 4.6 was already released, and it seems working fine to me.
- be able to specify dbname with --with-bdb, explicitly.
- include stdio.h for NULL.

Index: cmulocal/berkdb.m4
diff -u cmulocal/berkdb.m4.orig cmulocal/berkdb.m4
--- cmulocal/berkdb.m4.orig	Tue May 23 22:27:15 2006
+++ cmulocal/berkdb.m4	Wed May 24 00:08:16 2006
@@ -213,10 +213,11 @@
 	fi
 
 	saved_LIBS=$LIBS
-        for dbname in db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
           do
 	    LIBS="$saved_LIBS -l$dbname"
-	    AC_TRY_LINK([#include <db.h>],
+	    AC_TRY_LINK([#include <stdio.h>
+#include <db.h>],
 	    [db_create(NULL, NULL, 0);],
 	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
             dblib="no")
@@ -224,7 +225,8 @@
           done
         if test "$dblib" = "no"; then
 	    LIBS="$saved_LIBS -ldb"
-	    AC_TRY_LINK([#include <db.h>],
+	    AC_TRY_LINK([#include <stdio.h>
+#include <db.h>],
 	    [db_open(NULL, 0, 0, 0, NULL, NULL, NULL);],
 	    BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db,
             dblib="no")

Sincerely,

--
Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan
ume at mahoroba.org  ume@{,jp.}FreeBSD.org
http://www.imasy.org/~ume/