$NetBSD: patch-ab,v 1.7 2004/08/04 19:41:07 jlam Exp $

--- aclocal.m4.orig	Fri Jul  2 15:39:50 2004
+++ aclocal.m4
@@ -1714,7 +1714,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK],
 	dnl Note that FreeBSD puts it in a wierd place
         dnl (but they should use with-bdb-incdir)
         AC_CHECK_HEADER(db.h,
-                        CYRUS_BERKELEY_DB_CHK_LIB(),
+                        [CYRUS_BERKELEY_DB_CHK_LIB()],
                         dblib="no")
 
 	CPPFLAGS=$cmu_save_CPPFLAGS
@@ -2910,7 +2910,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"
