From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 11 Jul 2005 20:10:39 +0000 (+0000)
Subject: STABLE14-aklog-assume-old-autoconf-20050706
X-Git-Tag: openafs-devel-1_3_85~13
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c2f08274b975cc2c1ece0d3f7f21708783866553;p=packages%2Fo%2Fopenafs.git

STABLE14-aklog-assume-old-autoconf-20050706


old autoconf is my fiend


(cherry picked from commit 043900fb415e2eb5327fd3c3f89064a403b3166e)
---

diff --git a/src/cf/kerberos.m4 b/src/cf/kerberos.m4
index 7f8e58c17..16280b5cb 100644
--- a/src/cf/kerberos.m4
+++ b/src/cf/kerberos.m4
@@ -60,7 +60,37 @@ if test X$conf_krb5 = XYES; then
 	LIBS="$LIBS $KRB5LIBS"
 	AC_CHECK_FUNCS([add_to_error_table add_error_table krb5_princ_size krb5_principal_get_comp_string krb5_524_convert_creds krb524_convert_creds_kdc])
 	AC_CHECK_HEADERS([kerberosIV/krb.h])
-	AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.session],,, [#include <krb5.h>])
+
+AC_MSG_CHECKING(for krb5_creds.keyblock existance)
+AC_CACHE_VAL(ac_cv_krb5_creds_keyblock_exists,
+[
+AC_TRY_COMPILE(
+[#include <krb5.h>],
+[struct krb5_creds _c;
+printf("%x\n", _c.keyblock);], 
+ac_cv_krb5_creds_keyblock_exists=yes,
+ac_cv_krb5_creds_keyblock_exists=no)])
+AC_MSG_RESULT($ac_cv_krb5_creds_keyblock_exists)
+	
+AC_MSG_CHECKING(for krb5_creds.keyblock existance)
+AC_CACHE_VAL(ac_cv_krb5_creds_session_exists,
+[
+AC_TRY_COMPILE(
+[#include <krb5.h>],
+[struct krb5_creds _c;
+printf("%x\n", _c.session);], 
+ac_cv_krb5_creds_session_exists=yes,
+ac_cv_krb5_creds_session_exists=no)])
+AC_MSG_RESULT($ac_cv_krb5_creds_session_exists)
+
+if "x$ac_cv_krb5_creds_keyblock_exists" = "xyes"; then
+	AC_DEFINE(HAVE_KRB5_CREDS_KEYBLOCK, 1, [define if krb5_creds has keyblock])
+fi
+if "x$ac_cv_krb5_creds_session_exists" = "xyes"; then
+	AC_DEFINE(HAVE_KRB5_CREDS_SESSION, 1, [define if krb5_creds has session])
+fi
+	
+dnl	AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.session],,, [#include <krb5.h>])
 	CPPFLAGS="$save_CPPFLAGS"
 	LIBS="$save_LIBS"
 fi