mirror of https://github.com/moparisthebest/curl
Based on one of those bug reports that are intercepted by a distro's bug
tracker (https://bugzilla.redhat.com/show_bug.cgi?id=316191), I now made curl-config --features and --protocols show the correct output when built with NSS.
This commit is contained in:
parent
0f77fe55b6
commit
57d2fb41d0
6
CHANGES
6
CHANGES
|
@ -6,6 +6,12 @@
|
||||||
|
|
||||||
Changelog
|
Changelog
|
||||||
|
|
||||||
|
Daniel S (29 October 2007)
|
||||||
|
- Based on one of those bug reports that are intercepted by a distro's bug
|
||||||
|
tracker (https://bugzilla.redhat.com/show_bug.cgi?id=316191), I now made
|
||||||
|
curl-config --features and --protocols show the correct output when built
|
||||||
|
with NSS.
|
||||||
|
|
||||||
Version 7.17.1 (29 October 2007)
|
Version 7.17.1 (29 October 2007)
|
||||||
|
|
||||||
Dan F (25 October 2007)
|
Dan F (25 October 2007)
|
||||||
|
|
|
@ -1566,13 +1566,17 @@ fi dnl OPENSSL != 1 -a GNUTLS_ENABLED != 1
|
||||||
if test "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED" = "x"; then
|
if test "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED" = "x"; then
|
||||||
AC_MSG_WARN([SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more.])
|
AC_MSG_WARN([SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more.])
|
||||||
AC_MSG_WARN([Use --with-ssl, --with-gnutls or --with-nss to address this.])
|
AC_MSG_WARN([Use --with-ssl, --with-gnutls or --with-nss to address this.])
|
||||||
|
else
|
||||||
|
# SSL is enabled, genericly
|
||||||
|
AC_SUBST(SSL_ENABLED)
|
||||||
|
SSL_ENABLED="1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl **********************************************************************
|
dnl **********************************************************************
|
||||||
dnl Check for the CA bundle
|
dnl Check for the CA bundle
|
||||||
dnl **********************************************************************
|
dnl **********************************************************************
|
||||||
|
|
||||||
if test X"$USE_NSS$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
|
if test X"$SSL_ENABLED" != "X"; then
|
||||||
|
|
||||||
AC_MSG_CHECKING([CA cert bundle install path])
|
AC_MSG_CHECKING([CA cert bundle install path])
|
||||||
|
|
||||||
|
|
|
@ -83,7 +83,7 @@ while test $# -gt 0; do
|
||||||
if test "@USE_SSLEAY@" = "1"; then
|
if test "@USE_SSLEAY@" = "1"; then
|
||||||
echo "SSL"
|
echo "SSL"
|
||||||
NTLM=1 # OpenSSL implies NTLM
|
NTLM=1 # OpenSSL implies NTLM
|
||||||
elif test -n "@USE_GNUTLS@"; then
|
elif test -n "@SSL_ENABLED@"; then
|
||||||
echo "SSL"
|
echo "SSL"
|
||||||
fi
|
fi
|
||||||
if test "@KRB4_ENABLED@" = "1"; then
|
if test "@KRB4_ENABLED@" = "1"; then
|
||||||
|
@ -113,13 +113,13 @@ while test $# -gt 0; do
|
||||||
--protocols)
|
--protocols)
|
||||||
if test "@CURL_DISABLE_HTTP@" != "1"; then
|
if test "@CURL_DISABLE_HTTP@" != "1"; then
|
||||||
echo "HTTP"
|
echo "HTTP"
|
||||||
if test "@USE_SSLEAY@" = "1"; then
|
if test "@SSL_ENABLED@" = "1"; then
|
||||||
echo "HTTPS"
|
echo "HTTPS"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test "@CURL_DISABLE_FTP@" != "1"; then
|
if test "@CURL_DISABLE_FTP@" != "1"; then
|
||||||
echo "FTP"
|
echo "FTP"
|
||||||
if test "@USE_SSLEAY@" = "1"; then
|
if test "@SSL_ENABLED@" = "1"; then
|
||||||
echo "FTPS"
|
echo "FTPS"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue