From d6eee4e647348875912d9c6853a8de0a7d6069ad Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Sat, 18 Apr 2009 00:24:56 +0200
Subject: Imported Upstream version 0.9~rc1

---
 configure.ac | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index be95999..3b9c983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,10 +65,13 @@ AC_CHECK_MEMBERS(krb5_creds.flags.b.forwardable,,,[#include <krb5.h>])
 AC_CHECK_MEMBERS(krb5_creds.flags.b.renewable,,,[#include <krb5.h>])
 AC_CHECK_MEMBERS(krb5_creds.flags.b.proxiable,,,[#include <krb5.h>])
 AC_CHECK_MEMBERS(krb5_creds.flags,,,[#include <krb5.h>])
-AC_CHECK_FUNCS([krb5_get_error_message])
-AC_CHECK_FUNCS([krb5_get_renewed_creds])
-AC_CHECK_FUNCS([krb5_get_init_creds_opt_set_default_flags])
-AC_CHECK_FUNCS([krb5_cc_clear_mcred])
+AC_CHECK_FUNCS([krb5_get_error_message krb5_get_renewed_creds \
+                krb5_get_init_creds_opt_set_default_flags \
+                krb5_cc_clear_mcred])
+AC_CHECK_FUNCS([krb5_get_init_creds_opt_set_pkinit],
+		[heimdal_pkinit=yes],[heimdal_pkinit=no])
+AC_CHECK_FUNCS([krb5_get_init_creds_opt_set_pa],
+		[mit_pkinit=yes],[mit_pkinit=no])
 AC_MSG_CHECKING(if a krb5_principal->realm is a char*)
 AC_COMPILE_IFELSE([
 $ac_includes_default
@@ -95,29 +98,25 @@ main(int argc, char **argv)
 	foo->realm = bar;
 	return 0;
 }],[AC_DEFINE(HAVE_KRB5_PRINCIPAL_REALM_AS_DATA,1,[Define if the realm of a krb5_principal is a krb5_data])
-AC_MSG_RESULT(yes)],
-AC_MSG_RESULT(no))
+AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))
+
 dnl pkinit
 AC_MSG_CHECKING([whether to enable pkinit support])
 AC_ARG_ENABLE([pkinit],
 	AS_HELP_STRING([--enable-pkinit],[whether to enable preauth via pkinit support]),
 	[],[enable_pkinit=autodetect])
-AC_MSG_RESULT([$enable_pkinit])
 
-if test "x$enable_pkinit" != "xno"; then
-	AC_CHECK_FUNCS([krb5_get_init_creds_opt_set_pkinit],
-		[enable_pkinit=yes],[enable_pkinit=no])
-fi
-
-if test "x$enable_pkinit" = "xyes"; then
+if test "x$heimdal_pkinit" = "xyes" -o \
+        "x$mit_pkinit" = "xyes"; then
+	enable_pkinit=yes
 	AC_DEFINE([ENABLE_PKINIT],[1],[Define for pkinit support])
 fi
+AC_MSG_RESULT([$enable_pkinit])
 AM_CONDITIONAL([ENABLE_PKINIT],[test "x$enable_pkinit" = "xyes"])
 CFLAGS="$savedCFLAGS"
 LIBS="$savedLIBS"
 
 
-
 dnl NetworkManager
 AC_MSG_CHECKING([whether to enable NetworkManager support])
 AC_ARG_ENABLE([network-manager],
-- 
cgit