s3-kerberos: add check for prerequisite krb5/krb5.h header while checking for krb5...

(Needed for new Heimdal versions).

Guenther

diff --git a/source3/configure.in b/source3/configure.in
index aab8c01473c27189a416208c1c2ddfa5ba21c3ef..f624e0ef5d6831a712c98222bc5586b96b87500d 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3329,7 +3329,7 @@ if test x"$with_ads_support" != x"no"; then
   # now check for krb5.h. Some systems have the libraries without the headers!
   # note that this check is done here to allow for different kerberos
   # include paths
-  AC_CHECK_HEADERS(krb5.h)
+  AC_CHECK_HEADERS(krb5.h krb5/krb5.h)
 
   if test x"$ac_cv_header_krb5_h" = x"no"; then
 
@@ -3350,7 +3350,12 @@ if test x"$with_ads_support" != x"no"; then
     CPPFLAGS=$ac_save_CPPFLAGS
     LDFLAGS=$ac_save_LDFLAGS
   fi
-  AC_CHECK_HEADERS(krb5/locate_plugin.h)
+  AC_CHECK_HEADERS([krb5/locate_plugin.h], [], [],
+[[#ifdef HAVE_KRB5_KRB5_H
+ #include <krb5/krb5.h>
+ #endif
+]])
+
   if test x"$ac_cv_header_krb5_locate_plugin_h" = x"yes"; then
        WINBIND_KRB5_LOCATOR="bin/winbind_krb5_locator.$SHLIBEXT"
        if test x"$BLDSHARED" = x"true" ; then