Fixed the output of curl-config --protocols which showed SCP and SFTP

always, except when --without-libssh2 was given

diff --git a/CHANGES b/CHANGES
index 1819929d87c0ed16d1fafafd3bc8a4e9b864ebe3..4a5814a4e785a6de261c9513575c3130aedabeef 100644 (file)
--- 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 40ae749ac8017b9dd4e75e422cc1ae196e9296c0..e0194b48722bcadc5eefcc22c69b4aa25c1a7e71 100644 (file)
--- 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 798ba6afcbdb111c0d6bfd986f1d89e46403d3f6..8dc46afc106e690c6c009dff156e5d466376b812 100644 (file)
--- 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