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)

diff --git a/source/include/includes.h b/source/include/includes.h
index 09174687cbabf996eb7931719121f9412792a471..8aa34ff8fce3f47f9a07404d5c4a5ff9f06cc124 100644 (file)
--- 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 4862a23b3d48dfd86dc5dd5ba2c18393f4697468..c75ef78e949e15ef2de725ef53526b24c22c8c31 100644 (file)
--- 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)