From: Russ Allbery <rra@stanford.edu>
Date: Mon, 11 Jul 2005 20:16:42 +0000 (+0000)
Subject: STABLE14-krb5-configure-fixes-20050707
X-Git-Tag: openafs-devel-1_3_85~11
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4365b6a807407a1510c97fdf531b67498b979fba;p=packages%2Fo%2Fopenafs.git

STABLE14-krb5-configure-fixes-20050707

FIXES 19862

Use krb5_creds rather than struct krb5_creds, add missing test in if
statements for krb5_creds structure probes, and tweak the configure output.


(cherry picked from commit 06e66a65c5aaff6d3095fd989ef013df0acc4477)
---

diff --git a/src/cf/kerberos.m4 b/src/cf/kerberos.m4
index 16280b5cb..939d7f3bd 100644
--- a/src/cf/kerberos.m4
+++ b/src/cf/kerberos.m4
@@ -61,32 +61,32 @@ if test X$conf_krb5 = XYES; then
 	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_MSG_CHECKING(for krb5_creds.keyblock existance)
+AC_MSG_CHECKING(for krb5_creds.keyblock existence)
 AC_CACHE_VAL(ac_cv_krb5_creds_keyblock_exists,
 [
 AC_TRY_COMPILE(
 [#include <krb5.h>],
-[struct krb5_creds _c;
+[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_MSG_CHECKING(for krb5_creds.session existence)
 AC_CACHE_VAL(ac_cv_krb5_creds_session_exists,
 [
 AC_TRY_COMPILE(
 [#include <krb5.h>],
-[struct krb5_creds _c;
+[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
+if test "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
+if test "x$ac_cv_krb5_creds_session_exists" = "xyes"; then
 	AC_DEFINE(HAVE_KRB5_CREDS_SESSION, 1, [define if krb5_creds has session])
 fi