[evolution-patches] Patch for handling com_err.h better

[Rodney Dawes <dobey novell com>]

This patch is in the NLD builds of 1.5, and handles having com_err.h in
the et/ subdirectory.

-- dobey

Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.705
diff -u -r1.705 configure.in
--- configure.in	12 Aug 2004 21:08:49 -0000	1.705
+++ configure.in	12 Aug 2004 21:31:06 -0000
@@ -565,6 +565,9 @@
 	AC_MSG_RESULT($with_krb5)
 fi
 
+AC_CHECK_HEADER([et/com_err.h],[AC_DEFINE([HAVE_ET_COM_ERR_H])])
+AC_CHECK_HEADER([com_err.h],[AC_DEFINE([HAVE_COM_ERR_H])])
+
 msg_krb4="no"
 if test "x${with_krb4}" != "xno"; then
 	LDFLAGS_save="$LDFLAGS"
Index: camel/camel-sasl-gssapi.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/camel-sasl-gssapi.c,v
retrieving revision 1.9
diff -u -r1.9 camel-sasl-gssapi.c
--- camel/camel-sasl-gssapi.c	25 Feb 2004 20:11:07 -0000	1.9
+++ camel/camel-sasl-gssapi.c	12 Aug 2004 21:31:07 -0000
@@ -28,7 +28,11 @@
 #ifdef HAVE_KRB5
 
 #include <string.h>
+#ifdef HAVE_ET_COM_ERR_H
+#include <et/com_err.h>
+#else
 #include <com_err.h>
+#endif
 #ifdef HAVE_MIT_KRB5
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_generic.h>