test-heimdal-20060217
[openafs.git] / src / cf / kerberos.m4
index 16280b5..8ec840d 100644 (file)
@@ -60,33 +60,34 @@ 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_HEADERS([kerberosV/heim_err.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
        
@@ -94,7 +95,16 @@ dnl  AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.session],,, [#include <krb
        CPPFLAGS="$save_CPPFLAGS"
        LIBS="$save_LIBS"
 fi
+
+if test "$ac_cv_header_kerberosV_heim_err_h" = "yes"; then
+    ASETKEY=
+else
+    ASETKEY=asetkey
+fi
+
 AC_SUBST(BUILD_KRB5)
 AC_SUBST(KRB5CFLAGS)
 AC_SUBST(KRB5LIBS)
+AC_SUBST(ASETKEY)
+
 ])dnl