diff options
| author | Michael Osipov <1983-01-06@gmx.net> | 2014-07-21 09:53:45 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-07-23 00:01:39 +0200 |
| commit | 46750c39bd3ece85ddef6a9dafd04bcd2748bc50 (patch) | |
| tree | 0d30c87065f5d40458c58ae67865e37848b52de4 /configure.ac | |
| parent | 5128672731a5edef2c7526610584fef821ec2309 (diff) | |
configure/features: Add feature and version info for GSS-API and SPNEGO
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index b78f56d0e..1fa09eea9 100644 --- a/configure.ac +++ b/configure.ac @@ -1248,7 +1248,7 @@ else fi if test x"$want_gss" = xyes; then AC_DEFINE(HAVE_GSSAPI, 1, [if you have GSS-API libraries]) - + HAVE_GSSAPI=1 curl_gss_msg="enabled (MIT Kerberos/Heimdal)" if test -n "$gnu_gss"; then @@ -3356,8 +3356,18 @@ fi if test "x$USE_WINDOWS_SSPI" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES SSPI" fi + +if test "x$HAVE_GSSAPI" = "x1"; then + SUPPORT_FEATURES="$SUPPORT_FEATURES GSS-API" +fi + +if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" -a \ + \( "x$HAVE_GSSAPI" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \); then + SUPPORT_FEATURES="$SUPPORT_FEATURES SPNEGO" +fi + if test "x$CURL_DISABLE_HTTP" != "x1" -a \ - "x$CURL_DISABLE_CRYPTO_AUTH" != "x1"; then + "x$CURL_DISABLE_CRYPTO_AUTH" != "x1"; then if test "x$USE_SSLEAY" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \ -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1" \ -o "x$DARWINSSL_ENABLED" = "x1"; then @@ -3374,9 +3384,6 @@ fi if test "x$USE_NGHTTP2" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES HTTP2" fi -if test "x$want_gss" = "xyes"; then - SUPPORT_FEATURES="$SUPPORT_FEATURES GSS-API" -fi AC_SUBST(SUPPORT_FEATURES) |