Bug 603773 - com_err.h doesn't exist on Solaris

diff --git a/camel/camel-sasl-gssapi.c b/camel/camel-sasl-gssapi.c
index e2d05b3..8abbc0b 100644 (file)
--- a/camel/camel-sasl-gssapi.c
+++ b/camel/camel-sasl-gssapi.c
@@ -39,8 +39,10 @@
 #ifdef HAVE_ET_COM_ERR_H
 #include <et/com_err.h>
 #else
+#ifdef HAVE_COM_ERR_H
 #include <com_err.h>
 #endif
+#endif
 #ifdef HAVE_MIT_KRB5
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_generic.h>

diff --git a/m4/evo_krb5_support.m4 b/m4/evo_krb5_support.m4
index fd27581..109eeb1 100644 (file)
--- a/m4/evo_krb5_support.m4
+++ b/m4/evo_krb5_support.m4
@@ -87,13 +87,13 @@ AC_DEFUN([EVO_KRB5_SUPPORT],[
        AM_CONDITIONAL(ENABLE_KRB5, [test "x$with_krb5" != "xno"])
 
        AC_CHECK_HEADER([et/com_err.h],
-               [AC_DEFINE([HAVE_ET_COM_ERR_H], 1, [Have <et/comm_err.h>])],,
+               [AC_DEFINE([HAVE_ET_COM_ERR_H], 1, [Have <et/com_err.h>])],,
                [[      #if HAVE_ET_COM_ERR_H
                        #include <com_err.h>
                        #endif
                ]])
        AC_CHECK_HEADER([com_err.h],
-               [AC_DEFINE([HAVE_COM_ERR_H], 1, [Have <comm_err.h>])],,
+               [AC_DEFINE([HAVE_COM_ERR_H], 1, [Have <com_err.h>])],,
                [[      #if HAVE_COM_ERR_H
                        #include <com_err.h>
                        #endif