diff options
| author | Björn Jacke <bj@sernet.de> | 2009-02-22 19:46:40 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-07-30 09:22:12 +0200 |
| commit | d73ee18c15a1c1369b5a8c0ae88f6ec704d21404 (patch) | |
| tree | 7ba30dbca7df9a92faaf2055a189d1971e92fcba | |
| parent | 213581c68f67800858958ca79cb6de73fa57b507 (diff) | |
| download | samba-d73ee18c15a1c1369b5a8c0ae88f6ec704d21404.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)
(cherry picked from commit b4fc28ddffa4f9a74ca72ee6c2d30f544de5360c)
| -rw-r--r-- | source/include/includes.h | 6 | ||||
| -rw-r--r-- | source/libaddns/dns.h | 6 |
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) |