Based on one of those bug reports that are intercepted by a distro's bug

tracker (https://bugzilla.redhat.com/show_bug.cgi?id=316191), I now made
curl-config --features and --protocols show the correct output when built
with NSS.

diff --git a/CHANGES b/CHANGES
index d409fa5..9b95299 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,12 @@
 
                                   Changelog
 
+Daniel S (29 October 2007)
+- Based on one of those bug reports that are intercepted by a distro's bug
+  tracker (https://bugzilla.redhat.com/show_bug.cgi?id=316191), I now made
+  curl-config --features and --protocols show the correct output when built
+  with NSS.
+
 Version 7.17.1 (29 October 2007)
 
 Dan F (25 October 2007)

diff --git a/configure.ac b/configure.ac
index a0c4fae..798ba6a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1566,13 +1566,17 @@ fi dnl OPENSSL != 1 -a GNUTLS_ENABLED != 1
 if test "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED" = "x"; then
   AC_MSG_WARN([SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more.])
   AC_MSG_WARN([Use --with-ssl, --with-gnutls or --with-nss to address this.])
+else
+  # SSL is enabled, genericly
+  AC_SUBST(SSL_ENABLED)
+  SSL_ENABLED="1"
 fi
 
 dnl **********************************************************************
 dnl Check for the CA bundle
 dnl **********************************************************************
 
-if test X"$USE_NSS$USE_GNUTLS$OPENSSL_ENABLED" != "X"; then
+if test X"$SSL_ENABLED" != "X"; then
 
   AC_MSG_CHECKING([CA cert bundle install path])
 

diff --git a/curl-config.in b/curl-config.in
index 1578371..ce98bde 100644 (file)
--- a/curl-config.in
+++ b/curl-config.in
@@ -83,7 +83,7 @@ while test $# -gt 0; do
        if test "@USE_SSLEAY@" = "1"; then
           echo "SSL"
           NTLM=1 # OpenSSL implies NTLM
-        elif test -n "@USE_GNUTLS@"; then
+        elif test -n "@SSL_ENABLED@"; then
           echo "SSL"
         fi
        if test "@KRB4_ENABLED@" = "1"; then
@@ -113,13 +113,13 @@ while test $# -gt 0; do
     --protocols)
        if test "@CURL_DISABLE_HTTP@" != "1"; then
           echo "HTTP"
-         if test "@USE_SSLEAY@" = "1"; then
+         if test "@SSL_ENABLED@" = "1"; then
             echo "HTTPS"
           fi
         fi
        if test "@CURL_DISABLE_FTP@" != "1"; then
           echo "FTP"
-         if test "@USE_SSLEAY@" = "1"; then
+         if test "@SSL_ENABLED@" = "1"; then
             echo "FTPS"
           fi
         fi