aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-10-29 22:13:00 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-10-29 22:13:00 +0000
commit57d2fb41d093a62f0e1ddfdfb94f136a0f4ab3a4 (patch)
tree545c725c10a9a6577397d109573feb95e1badfc0
parent0f77fe55b6efbf090b30a3612b314cd2f8e27b3a (diff)
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.
-rw-r--r--CHANGES6
-rw-r--r--configure.ac6
-rw-r--r--curl-config.in6
3 files changed, 14 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index d409fa5ff..9b9529997 100644
--- 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 a0c4fae67..798ba6afc 100644
--- 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 157837143..ce98bdee3 100644
--- 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