prefer gssapi header files from subdirectory

this fixes some compile time noise on FreeBSD 7
(cherry picked from commit 1bfdbb093f7c5e434ea3e653d389e1ccec578af6)

diff --git a/source/include/includes.h b/source/include/includes.h
index c5dfa244b1dccafcf4312618b53cdcb9c7a1badb..ccdb8868db8c6d4bf888b4a83dc4e3a0bc118b2c 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -207,12 +207,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 cf842f4d109711bafc55d0093d7cb4ecdbf08c42..c916ba36efdf61c3bb4375a11ed85e752b892d1d 100644 (file)
--- a/source/libaddns/dns.h
+++ b/source/libaddns/dns.h
@@ -81,12 +81,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)