svn commit: samba r6879 - in branches/SAMBA_4_0/source/include/system: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-05-18 11:50:09 +0000 (Wed, 18 May 2005)
New Revision: 6879

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6879

Log:
Another attempt at including the 'right' kerberos headers on
dual-install systems.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/include/system/kerberos.h


Changeset:
Modified: branches/SAMBA_4_0/source/include/system/kerberos.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/kerberos.h	2005-05-18 10:36:00 UTC (rev 6878)
+++ branches/SAMBA_4_0/source/include/system/kerberos.h	2005-05-18 11:50:09 UTC (rev 6879)
@@ -28,19 +28,22 @@
 #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>
+# include <gssapi/gssapi_generic.h>
+# if defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
+#  include <gssapi/gssapi_krb5.h>
+# endif
 #endif
 
-#ifdef HAVE_GSSAPI_KRB5_H
-#include <gssapi_krb5.h>
-#elif defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
-#include <gssapi/gssapi_krb5.h>
-#endif
-
 #ifdef HAVE_COM_ERR_H
 #include <com_err.h>
 #endif