diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2009-05-24 19:58:47 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2009-05-24 19:58:47 +0000 |
| commit | c429f806fe5230762151f2b290175a671e87c711 (patch) | |
| tree | 62d5d0377cca67f265e902ed7f03e05ef6751f08 /src | |
| parent | 704e18e821c217c65f3c1ae2103d7d5e9b9e78f7 (diff) | |
If --enable-pkinit is explicitly given, and OpenSSL is too old, error out instead of
ignoring the option and disabling pkinit.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22370 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/configure.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/configure.in b/src/configure.in index b0d362489..94775f136 100644 --- a/src/configure.in +++ b/src/configure.in @@ -884,8 +884,8 @@ AC_SUBST(PASS) dnl for pkinit AC_ARG_ENABLE([pkinit], [ --disable-pkinit disable PKINIT plugin support],, -enable_pkinit=yes) -if test "$enable_pkinit" = yes; then +enable_pkinit=try) +if test "$enable_pkinit" = yes || test "$enable_pkinit" = try; then AC_CACHE_CHECK(for a recent enough OpenSSL, k5_cv_openssl_version_okay, [AC_COMPILE_IFELSE([#include <openssl/opensslv.h> #if OPENSSL_VERSION_NUMBER < 0x00908000L @@ -897,8 +897,10 @@ int i = 1; AC_CHECK_LIB(crypto, PKCS7_get_signer_info) LIBS="$old_LIBS" fi -if test "$k5_cv_openssl_version_okay" = yes && test "$enable_pkinit" = yes; then +if test "$k5_cv_openssl_version_okay" = yes && (test "$enable_pkinit" = yes || test "$enable_pkinit" = try); then K5_GEN_MAKEFILE(plugins/preauth/pkinit) +elif test "$k5_cv_openssl_version_okay" = no && test "$enable_pkinit" = yes; then + AC_MSG_ERROR([Version of OpenSSL is too old; cannot enable PKINIT.]) else AC_DEFINE([DISABLE_PKINIT], 1, [Define to disable PKINIT plugin support]) AC_MSG_NOTICE([Disabling PKINIT support.]) |