--- source3/configure.in.orig	Sun Mar  6 13:48:05 2011

+++ source3/configure.in	Wed May  4 00:55:55 2011

@@ -3379,7 +3379,7 @@

 # HPUX only has ldap_init; ok, we take care of this in smbldap.c

 case "$host_os" in

-	*hpux*)

+	*hpux* | *solaris* )

     AC_CHECK_FUNC_EXT(ldap_init,$LDAP_LIBS)

     if test x"$ac_cv_func_ext_ldap_init" != x"yes"; then

@@ -3436,7 +3436,7 @@

         ;;

       yes)

         AC_MSG_RESULT(/usr)

-        FOUND_KRB5=yes

+        # FOUND_KRB5=yes	# Breaks later checks!

         ;;

       *)

         AC_MSG_RESULT($withval)

@@ -3525,6 +3525,21 @@

     fi

   fi

+  if test x$FOUND_KRB5 = x"no"; then

+    #################################################

+    # see if this box has Solaris MIT kerberos implementation

+    AC_MSG_CHECKING(for Solaris MIT kerberos)

+    if test -x "$KRB5CONFIG" && $KRB5CONFIG --version | grep -s Solaris | grep -s MIT > /dev/null ; then

+	FOUND_KRB5=yes

+	KRB5_LIBS="-lgss -lkrb5"

+	KRB5_CFLAGS="`$KRB5CONFIG --cflags`"

+	KRB5_CPPFLAGS="`$KRB5CONFIG --cflags`"

+	AC_MSG_RESULT(yes)

+    else

+      AC_MSG_RESULT(no)

+    fi

+  fi

+

   ac_save_CFLAGS=$CFLAGS

   ac_save_CPPFLAGS=$CPPFLAGS

   ac_save_LDFLAGS=$LDFLAGS

@@ -3601,7 +3616,7 @@

   # now check for gssapi headers.  This is also done here to allow for

   # different kerberos include paths

-  AC_CHECK_HEADERS(gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h)

+  AC_CHECK_HEADERS(gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_krb5.h com_err.h)

   ##################################################################

   # we might need the k5crypto and com_err libraries on some systems

@@ -3626,6 +3641,7 @@

   # now see if we can find the gssapi libs in standard paths

   if test x"$have_gssapi" != x"yes"; then

      AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[],have_gssapi=yes)

+     AC_CHECK_LIB_EXT(gss, KRB5_LIBS,gss_display_status,[],[],have_gssapi=yes)

   fi

   AC_CHECK_FUNC_EXT(krb5_set_real_time, $KRB5_LIBS)