aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2007-10-31 23:33:58 +0000
committerDan Fandrich <dan@coneharvesters.com>2007-10-31 23:33:58 +0000
commit823a0454a6e2d3d37862a4dc2867c22b073b9f84 (patch)
tree63772114f8274ac7f3d390ec10d99ad0abee067b
parent6790c559afb1724607ae077fb3664efbef959557 (diff)
Fixed the output of curl-config --protocols which showed SCP and SFTP
always, except when --without-libssh2 was given
-rw-r--r--CHANGES4
-rw-r--r--RELEASE-NOTES2
-rw-r--r--configure.ac3
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 1819929d8..4a5814a4e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
Changelog
+Dan F (31 October 2007)
+- Fixed the output of curl-config --protocols which showed SCP and SFTP
+ always, except when --without-libssh2 was given
+
Dan F (30 October 2007)
- Fixed an OOM problem with file: URLs
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 40ae749ac..e0194b487 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -15,7 +15,7 @@ This release includes the following changes:
This release includes the following bugfixes:
o curl-config --features and --protocols show the correct output when built
- with NSS
+ with NSS, and also when SCP and SFTP are not available
This release includes the following known bugs:
diff --git a/configure.ac b/configure.ac
index 798ba6afc..8dc46afc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1356,8 +1356,9 @@ if test X"$OPT_LIBSSH2" != Xno; then
AC_CHECK_HEADERS(libssh2.h,
curl_ssh_msg="enabled (libSSH2)"
LIBSSH2_ENABLED=1
- AC_DEFINE(USE_LIBSSH2, 1, [if libSSH2 is in use]))
+ AC_DEFINE(USE_LIBSSH2, 1, [if libSSH2 is in use])
AC_SUBST(USE_LIBSSH2, [1])
+ )
if test X"$OPT_LIBSSH2" != Xoff &&
test "$LIBSSH2_ENABLED" != "1"; then