$NetBSD: patch-ab,v 1.4 2006/04/13 21:32:40 wiz Exp $

--- aclocal.m4.orig	2004-10-24 16:21:05.000000000 -0400
+++ aclocal.m4
@@ -1678,7 +1678,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
 	    LIBS="$saved_LIBS -l$dbname"
 	    AC_TRY_LINK([#include <db.h>],
 	    [db_create(NULL, NULL, 0);],
-	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
+	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break,
             dblib="no")
           done
         if test "$dblib" = "no"; then
@@ -2923,7 +2923,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
   AC_MSG_RESULT(with implementation ${gss_impl})
   AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
   SASL_MECHS="$SASL_MECHS libgssapiv2.la"
-  SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
+  if test "$enable_static" = yes; then
+    SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
+    AC_DEFINE(STATIC_GSSAPIV2, [], [Link GSSAPI Staticly])
+  fi
 
   cmu_save_LIBS="$LIBS"
   LIBS="$LIBS $GSSAPIBASE_LIBS"