r6879: Another attempt at including the 'right' kerberos headers on

dual-install systems.

Andrew Bartlett
(This used to be commit efc24f1a4592270634dca253689c1b54e154d8b8)

diff --git a/source4/include/system/kerberos.h b/source4/include/system/kerberos.h
index 28ff260438b6edaf40386a7e5f4250ffe2cae4c1..e0a926300ffa0c2cc79bae27c0c3fc2372d926f8 100644 (file)
--- a/source4/include/system/kerberos.h
+++ b/source4/include/system/kerberos.h
@@ -28,17 +28,20 @@
 #endif
 
 #if defined(HAVE_GSSAPI_H)
-#include <gssapi.h>
+# include <gssapi.h>
+# ifdef HAVE_GSSAPI_KRB5_H
+#  include <gssapi_krb5.h>
+# endif
 #elif defined(HAVE_GSSAPI_GSSAPI_H)
-#include <gssapi/gssapi.h>
+# include <gssapi/gssapi.h>
+# if defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
+#  include <gssapi/gssapi_krb5.h>
+# endif
 #elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
-#include <gssapi/gssapi_generic.h>
-#endif
-
-#ifdef HAVE_GSSAPI_KRB5_H
-#include <gssapi_krb5.h>
-#elif defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
-#include <gssapi/gssapi_krb5.h>
+# include <gssapi/gssapi_generic.h>
+# if defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
+#  include <gssapi/gssapi_krb5.h>
+# endif
 #endif
 
 #ifdef HAVE_COM_ERR_H