From 676d62fa0ede12e8f66688675d9db3bb7103cd55 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Tue, 11 Nov 2014 00:04:05 +0000 Subject: configure: Fixed inclusion of krb5 when CURL_DISABLE_CRYPTO_AUTH is defined Commit fe0f8967bf fixed a problem with krb5 not being defined as a supported feature when HAVE_GSSAPI is defined, however, it should only be included if CURL_DISABLE_CRYPTO_AUTH is not set, like when SPNEGO is listed as a feature. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 1f801adcc..64887ef21 100644 --- a/configure.ac +++ b/configure.ac @@ -3354,7 +3354,7 @@ if test "x$USE_WINDOWS_SSPI" = "x1"; then fi if test "x$HAVE_GSSAPI" = "x1"; then - SUPPORT_FEATURES="$SUPPORT_FEATURES GSS-API krb5" + SUPPORT_FEATURES="$SUPPORT_FEATURES GSS-API" fi if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" -a \ @@ -3363,7 +3363,7 @@ if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" -a \ fi if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" -a \ - \( "x$USE_WINDOWS_SSPI" = "x1" \); then + \( "x$HAVE_GSSAPI" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \); then SUPPORT_FEATURES="$SUPPORT_FEATURES krb5" fi -- cgit v1.2.3