When curl is built with GnuTLS, curl-config didn't include "SSL" when

--features was used

diff --git a/CHANGES b/CHANGES
index b6b5a83f08898855beb86ddbcf8087fcfa2c9510..1801cf552e1d615b64a6d729f37f4ca61e9242ba 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@
                                   Changelog
 
 
+Daniel (7 August 2005)
+- When curl is built with GnuTLS, curl-config didn't include "SSL" when
+  --features was used.
+
 Daniel (28 July 2005)
 - If any of the options CURLOPT_HTTPGET, CURLOPT_POST and CURLOPT_HTTPPOST is
   set to 1, CURLOPT_NOBODY will now automatically be set to 0.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2cc0a92bbd36ce21f3476730d80d0a8ed34529f7..114698340a72a0fa72cd2ae9a7ee68b153e659b5 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -18,6 +18,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o curl-config --features now displays SSL when built with GnuTLS too
  o CURLOPT_HTTPGET, CURLOPT_POST and CURLOPT_HTTPPOST reset CURLOPT_NOBODY
  o builds fine on AmigaOS again
  o corrected date parsing on Windows with auto-DST-adjust enabled

diff --git a/curl-config.in b/curl-config.in
index 76157979a3cb8ac65fd3857467fd2c837e8c2a9a..b755ad5a46b2ea6bfe6c9f95c3db5dc8126f0b65 100644 (file)
--- a/curl-config.in
+++ b/curl-config.in
@@ -60,7 +60,9 @@ while test $# -gt 0; do
     --feature|--features)
        if test "@USE_SSLEAY@" = "1"; then
           echo "SSL"
-          NTLM=1
+          NTLM=1 # OpenSSL implies NTLM
+        elif test -n "@USE_GNUTLS@"; then
+          echo "SSL"
         fi
        if test "@KRB4_ENABLED@" = "1"; then
           echo "KRB4"