aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-08-07 21:45:59 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-08-07 21:45:59 +0000
commit8f219af884dcb330d96d71928c9bbdd003919b4b (patch)
tree5459014ea4c29600bc13e96a4842687cc5a75084
parentaeb04136f7c2c72f9005546bfff22c4046f93a74 (diff)
When curl is built with GnuTLS, curl-config didn't include "SSL" when
--features was used
-rw-r--r--CHANGES4
-rw-r--r--RELEASE-NOTES1
-rw-r--r--curl-config.in4
3 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index b6b5a83f0..1801cf552 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 2cc0a92bb..114698340 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 76157979a..b755ad5a4 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"