Home | History | Annotate | Download | only in patches
      1  9549  sh162551 Index: configure.in
      2  9549  sh162551 ===================================================================
      3  9549  sh162551 RCS file: /cvs/gnome/evolution-data-server/configure.in,v
      4  9549  sh162551 retrieving revision 1.159.2.3
      5  9549  sh162551 diff -u -r1.159.2.3 configure.in
      6  9549  sh162551 --- configure.in	22 Mar 2006 11:21:06 -0000	1.159.2.3
      7  9549  sh162551 +++ configure.in	4 Apr 2006 11:00:59 -0000
      8  9549  sh162551 @@ -885,13 +885,18 @@
      9  9549  sh162551  	
     10  9549  sh162551  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
     11  9549  sh162551  	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
     12  9549  sh162551 +	sunlibs="-lkrb5 -lgss"
     13  9549  sh162551  	AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
     14  9549  sh162551  	[
     15  9549  sh162551  		LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs"
     16  9549  sh162551  		AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
     17  9549  sh162551  		[
     18  9549  sh162551  			LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs"
     19  9549  sh162551 -			AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5="no")
     20  9549  sh162551 +			AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", 
     21  9549  sh162551 +			[
     22  9549  sh162551 +				LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $sunlibs"
     23  9549  sh162551 +				AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$sunlibs", ac_cv_lib_kerberos5="no")
     24  9549  sh162551 +			])
     25  9549  sh162551  		])
     26  9549  sh162551  		LDFLAGS="$LDFLAGS_save"
     27  9549  sh162551  	])
     28  9549  sh162551 @@ -906,13 +911,23 @@
     29  9549  sh162551  			fi
     30  9549  sh162551  			msg_krb5="yes (MIT)"
     31  9549  sh162551  		else
     32  9549  sh162551 -			AC_DEFINE(HAVE_HEIMDAL_KRB5,1,[Define if you have Heimdal])
     33  9549  sh162551 -			if test -z "$with_krb5_includes"; then
     34  9549  sh162551 -				KRB5_CFLAGS="-I$with_krb5/include/heimdal"
     35  9549  sh162551 +			if test "$ac_cv_lib_kerberos5" = "$heimlibs"; then
     36  9549  sh162551 +				AC_DEFINE(HAVE_HEIMDAL_KRB5,1,[Define if you have Heimdal])
     37  9549  sh162551 +				if test -z "$with_krb5_includes"; then
     38  9549  sh162551 +					KRB5_CFLAGS="-I$with_krb5/include/heimdal"
     39  9549  sh162551 +				else
     40  9549  sh162551 +					KRB5_CFLAGS="-I$with_krb5_includes"
     41  9549  sh162551 +				fi
     42  9549  sh162551 +				msg_krb5="yes (Heimdal)"
     43  9549  sh162551  			else
     44  9549  sh162551 -				KRB5_CFLAGS="-I$with_krb5_includes"
     45  9549  sh162551 +				AC_DEFINE(HAVE_SUN_KRB5,1,[Define if you have Sun Kerberosv5])
     46  9549  sh162551 +				if test -z "$with_krb5_includes"; then
     47  9549  sh162551 +					KRB5_CFLAGS="-I$with_krb5/include/kerberosv5"
     48  9549  sh162551 +				else
     49  9549  sh162551 +					KRB5_CFLAGS="-I$with_krb5_includes"
     50  9549  sh162551 +				fi
     51  9549  sh162551 +				msg_krb5="yes (Sun)"
     52  9549  sh162551  			fi
     53  9549  sh162551 -			msg_krb5="yes (Heimdal)"
     54  9549  sh162551  		fi
     55  9549  sh162551  		KRB5_LDFLAGS="-L$with_krb5_libs $ac_cv_lib_kerberos5"
     56  9549  sh162551  	fi
     57  9549  sh162551 Index: camel/camel-sasl-gssapi.c
     58  9549  sh162551 ===================================================================
     59  9549  sh162551 RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl-gssapi.c,v
     60  9549  sh162551 retrieving revision 1.15
     61  9549  sh162551 diff -u -r1.15 camel-sasl-gssapi.c
     62  9549  sh162551 --- camel/camel-sasl-gssapi.c	31 Aug 2005 04:21:56 -0000	1.15
     63  9549  sh162551 +++ camel/camel-sasl-gssapi.c	30 May 2006 07:32:40 -0000
     64  9549  sh162551 @@ -39,9 +39,14 @@
     65  9549  sh162551  #ifdef HAVE_MIT_KRB5
     66  9549  sh162551  #include <gssapi/gssapi.h>
     67  9549  sh162551  #include <gssapi/gssapi_generic.h>
     68  9549  sh162551 -#else /* HAVE_HEIMDAL_KRB5 */
     69  9549  sh162551 +#endif
     70  9549  sh162551 +#ifdef HAVE_HEIMDAL_KRB5
     71  9549  sh162551  #include <gssapi.h>
     72  9549  sh162551  #define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
     73  9549  sh162551 +#else /* HAVE_SUN_KRB5 */
     74  9549  sh162551 +#include <gssapi/gssapi.h>
     75  9549  sh162551 +#include <gssapi/gssapi_ext.h>
     76  9549  sh162551 +extern gss_OID gss_nt_service_name;
     77  9549  sh162551  #endif
     78  9549  sh162551  #include <errno.h>
     79  9549  sh162551  
     80