aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--RELEASE-NOTES1
-rw-r--r--configure.ac4
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index ce9ecbff7..1b6388189 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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