diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2009-06-01 09:40:09 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2009-06-01 09:40:09 +0000 |
| commit | 9dcc1b33704f467b99630bac7d240161059b378c (patch) | |
| tree | f3c6f3cdcb6e02921312bd3716ecb1af4d7f0ac9 | |
| parent | e3c37aac283bcf48aec0753a23e38578d9bdb549 (diff) | |
- Claes Jakobsson fixed the configure script to better find and use NSS
without pkg-config.
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | RELEASE-NOTES | 1 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 7 insertions, 2 deletions
@@ -6,6 +6,10 @@ Changelog +Daniel Stenberg (1 June 2009) +- Claes Jakobsson fixed the configure script to better find and use NSS + without pkg-config. + Yang Tse (1 Jun 2009) - John E. Malmberg provided a VMS specific clean-up for curl.h, and pointed out that the configure script was failing to detect the timeval struct on diff --git a/RELEASE-NOTES b/RELEASE-NOTES index cd0051c2a..06adace70 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -17,6 +17,7 @@ This release includes the following bugfixes: o leaking cookie memory when duplicate domains or paths were used o build fix for Symbian o CURLOPT_USERPWD set to NULL clears auth credentials + o libcurl-NSS build fixes o libcurl-NSS build fix o configure script fixed for VMS diff --git a/configure.ac b/configure.ac index 16bb0f064..a7065e361 100644 --- a/configure.ac +++ b/configure.ac @@ -1663,10 +1663,10 @@ if test "$OPENSSL_ENABLED" != "1" -a "$GNUTLS_ENABLED" != "1"; then fi else # Without pkg-config, we'll kludge in some defaults - addlib="-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl" + addlib="-L$OPT_NSS/lib -lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl" addcflags="-I$OPT_NSS/include" version="unknown" - gtlsprefix=$OPT_GNUTLS + nssprefix=$OPT_NSS fi dnl Check for functionPK11_CreateGenericObject |