From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 7 Aug 2005 21:45:59 +0000 (+0000)
Subject: When curl is built with GnuTLS, curl-config didn't include "SSL" when
X-Git-Tag: curl-7_14_1~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f219af884dcb330d96d71928c9bbdd003919b4b;p=thirdparty%2Fcurl.git

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

diff --git a/CHANGES b/CHANGES
index b6b5a83f08..1801cf552e 100644
--- 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 2cc0a92bbd..114698340a 100644
--- 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 76157979a3..b755ad5a46 100644
--- 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"