[SVN] r466 - in /branches/cvsmerge/cyrus-cvs/cmulocal: CVS/Entries sasl2.m4

[debian at incase.de]

Author: sven
Date: Fri May 19 15:58:18 2006
New Revision: 466

URL: https://mail.incase.de/viewcvs?rev=466&root=cyrus22&view=rev
Log:
Latest upstream CVS update

Modified:
    branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries
    branches/cvsmerge/cyrus-cvs/cmulocal/sasl2.m4

Modified: branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries?rev=466&root=cyrus22&r1=465&r2=466&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries Fri May 19 15:58:18 2006
@@ -34,7 +34,6 @@
 /libssl.m4/1.10/Thu Feb  9 23:49:52 2006//
 /libwrap.m4/1.10/Thu Feb  9 23:49:52 2006//
 /sasl.m4/1.23/Thu Feb  9 23:49:52 2006//
-/sasl2.m4/1.51/Thu Feb  9 23:49:53 2006//
 /ucdsnmp.m4/1.11/Thu Feb  9 23:49:53 2006//
 /zephyr.m4/1.2/Thu Feb  9 23:49:53 2006//
 /clamav.m4/1.2/Sat May 28 02:26:59 2005//
@@ -45,4 +44,5 @@
 /openldap.m4/1.2/Tue May  2 20:02:31 2006//
 /telnet.m4/1.13/Tue May  2 20:02:31 2006//
 /openssl.m4/1.11/Wed May 17 19:02:55 2006//
+/sasl2.m4/1.52/Fri May 19 13:12:44 2006//
 D

Modified: branches/cvsmerge/cyrus-cvs/cmulocal/sasl2.m4
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/cmulocal/sasl2.m4?rev=466&root=cyrus22&r1=465&r2=466&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/cmulocal/sasl2.m4 (original)
+++ branches/cvsmerge/cyrus-cvs/cmulocal/sasl2.m4 Fri May 19 15:58:18 2006
@@ -1,6 +1,6 @@
 # sasl2.m4--sasl2 libraries and includes
 # Rob Siemborski
-# $Id: sasl2.m4,v 1.51 2005/05/07 04:15:17 shadow Exp $
+# $Id: sasl2.m4,v 1.52 2006/05/18 19:25:00 murch Exp $
 
 # SASL2_CRYPT_CHK
 # ---------------
@@ -110,9 +110,12 @@
   fi
 
   if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
+    # check for libkrb5support first
+    AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
+
     gss_failed=0
     AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
-                 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET})
+                 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
     if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
       gss_impl="failed"
     fi
@@ -164,8 +167,8 @@
   fi
 
   if test "$gss_impl" = "mit"; then
-    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}"
+    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
   elif test "$gss_impl" = "heimdal"; then
     CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"