Cyrus SASL 2.1.20 released

[Hajimu UMEMOTO]

Hi,

>>>>> On Sun, 24 Oct 2004 19:24:04 -0400 (EDT)
>>>>> Derrick J Brashear <shadow at andrew.cmu.edu> said:

shadow> Download at:
shadow> ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.20.tar.gz

It seems have two problems in detecting berkeley db.

  - NULL may be not defined.
  - Even when berkeley db is detected, it doesn't break from loop.

Index: cmulocal/berkdb.m4
diff -u cmulocal/berkdb.m4.orig cmulocal/berkdb.m4
--- cmulocal/berkdb.m4.orig	Tue Sep 14 06:57:17 2004
+++ cmulocal/berkdb.m4	Mon Oct 25 18:42:05 2004
@@ -215,14 +215,19 @@
         for dbname in 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")
+	    if test "$dblib" != "no"; then
+	      break
+	    fi
           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/