*** cmulocal/sasl2.m4.ORIG	Wed Oct  8 16:35:25 2003
--- cmulocal/sasl2.m4	Tue Nov 25 11:57:43 2003
***************
*** 6,11 ****
--- 6,14 ----
   AC_ARG_ENABLE(gssapi, [  --enable-gssapi=<DIR>   enable GSSAPI authentication [yes] ],
      gssapi=$enableval,
      gssapi=yes)
+  AC_ARG_WITH(gss_impl, [  --with-gss_impl={mit,heimdal,seam}   specify GSSAPI implementation ],
+     gss_impl=$withval,
+     gss_impl="check")
   AC_REQUIRE([SASL2_CRYPT_CHK])
   AC_REQUIRE([CMU_SOCKETS])
  
***************
*** 28,34 ****
    dnl we might need libdb
    AC_CHECK_LIB(db, db_open)
  
-   gss_impl="no";
    AC_CHECK_LIB(resolv,res_search)
    if test -d ${gssapi}; then 
       CPPFLAGS="$CPPFLAGS -I$gssapi/include"
--- 31,36 ----
***************
*** 48,60 ****
    # Check a full link against the heimdal libraries.
    # If this fails, check a full link against the MIT libraries.
    # If this fails, check a full link against the Solaris 8 and up libgss.
!   AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",,$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err ${LIB_SOCKET})
  
!   if test "$gss_impl" = "no"; then
      AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",,$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET})
    fi
  
!   if test "$gss_impl" = "no"; then
      AC_CHECK_LIB(gss,gss_unwrap,gss_impl="seam",,-lgss)
    fi
  
--- 50,65 ----
    # Check a full link against the heimdal libraries.
    # If this fails, check a full link against the MIT libraries.
    # If this fails, check a full link against the Solaris 8 and up libgss.
! 	
!   if test "$gss_impl" = "heimdal" -o "$gss_impl" = "check"; then
! 	  AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",,$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err ${LIB_SOCKET})
!   fi
  
!   if test "$gss_impl" = "mit" -o "$gss_impl" = "check"; then
      AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",,$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET})
    fi
  
!   if test "$gss_impl" = "seam" -o "$gss_impl" = "check"; then
      AC_CHECK_LIB(gss,gss_unwrap,gss_impl="seam",,-lgss)
    fi