summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2009-02-22 19:46:40 +0100
committerKarolin Seeger <kseeger@samba.org>2009-02-24 12:34:52 +0100
commitb4fc28ddffa4f9a74ca72ee6c2d30f544de5360c (patch)
tree0394384e0f56250d7ea226a8d7a2bafac2686e0a
parenteebc7e7ff0e6580b55ca0964a1f38096e11caa78 (diff)
downloadsamba-b4fc28ddffa4f9a74ca72ee6c2d30f544de5360c.tar.gz
prefer gssapi header files from subdirectory
this fixes some compile time noise on FreeBSD 7 (cherry picked from commit 1bfdbb093f7c5e434ea3e653d389e1ccec578af6) (cherry picked from commit de96e1a82d6e92c00a0ab3020db8d7c0284aadb1)
-rw-r--r--source/include/includes.h6
-rw-r--r--source/libaddns/dns.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/source/include/includes.h b/source/include/includes.h
index 09174687cba..8aa34ff8fce 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -208,12 +208,12 @@ typedef int ber_int_t;
#undef HAVE_LDAP
#endif
-#if HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_H
+#if HAVE_GSSAPI_GSSAPI_H
#include <gssapi/gssapi.h>
#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
+#elif HAVE_GSSAPI_H
+#include <gssapi.h>
#endif
#if HAVE_COM_ERR_H
diff --git a/source/libaddns/dns.h b/source/libaddns/dns.h
index 4862a23b3d4..c75ef78e949 100644
--- a/source/libaddns/dns.h
+++ b/source/libaddns/dns.h
@@ -74,12 +74,12 @@
#include <krb5.h>
#endif
-#if HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_H
+#if HAVE_GSSAPI_GSSAPI_H
#include <gssapi/gssapi.h>
#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
+#elif HAVE_GSSAPI_H
+#include <gssapi.h>
#endif
#if defined(HAVE_GSSAPI_H) || defined(HAVE_GSSAPI_GSSAPI_H) || defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)