Commit 64736dd1 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

configure: follow-up fix from 709cf76f 

OpenSSL handling was a little broken.
parent 709cf76f

configure.ac

+3 −3
Original line number Diff line number Diff line
@@ -3379,7 +3379,7 @@ dnl For keeping supported features and protocols also in pkg-config file 
dnl since it is more cross-compile friendly than curl-config

dnl



if test "x$USE_OPENSSL" = "x1"; then

if test "x$OPENSSL_ENABLED" = "x1"; then

  SUPPORT_FEATURES="$SUPPORT_FEATURES SSL"

elif test -n "$SSL_ENABLED"; then

  SUPPORT_FEATURES="$SUPPORT_FEATURES SSL"
@@ -3418,7 +3418,7 @@ if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" -a \ 
fi



if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1"; then

  if test "x$USE_OPENSSL" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \

  if test "x$OPENSSL_ENABLED" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \

      -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1" \

      -o "x$DARWINSSL_ENABLED" = "x1"; then

    SUPPORT_FEATURES="$SUPPORT_FEATURES NTLM"
@@ -3491,7 +3491,7 @@ if test "x$CURL_DISABLE_IMAP" != "x1"; then 
fi

if test "x$CURL_DISABLE_SMB" != "x1" \

    -a "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" \

    -a \( "x$USE_OPENSSL" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \

    -a \( "x$OPENSSL_ENABLED" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \

      -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1" \

      -o "x$DARWINSSL_ENABLED" = "x1" \); then

  SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SMB"