- Claes Jakobsson restored the configure functionality to detect NSS when

  --with-nss is set but not "yes".

  I think we can still improve that to check for pkg-config in that path etc,
  but at least this patch brings back the same functionality we had before.

diff --git a/CHANGES b/CHANGES
index 1a2273e0279e9707f7d36624f50c16bc67744c45..44d7618618f52141e500a42248b0f09de9d9a4a1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,14 @@
 
                                   Changelog
 
+
 Daniel Stenberg (14 Nov 2009)
+- Claes Jakobsson restored the configure functionality to detect NSS when
+  --with-nss is set but not "yes".
+
+  I think we can still improve that to check for pkg-config in that path etc,
+  but at least this patch brings back the same functionality we had before.
+
 - Camille Moncelier added support for the file type SSL_FILETYPE_ENGINE for
   the client certificate. It also disable the key name test as some engines
   can select a private key/cert automatically (When there is only one key

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9a4a6cfb44a335e388a5c3b910285b129db8ea04..4165591b5159f5572a8f4b515d9bc61aa7bf0913 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -19,6 +19,7 @@ This release includes the following bugfixes:
  o DNS cache timeout while transfer in progress
  o compilation when configured --with-gssapi having GNU GSS installed
  o SSL connection reused with mismatched protection level
+ o configure --with-nss is set but not "yes"
 
 This release includes the following known bugs:
 
@@ -28,6 +29,6 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  Yang Tse, Kamil Dudka, Christian Schmitz, Constantine Sapuntzakis,
- Marco Maggi
+ Marco Maggi, Camille Moncelier, Claes Jakobsson, Kevin Baughman
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/configure.ac b/configure.ac
index 5ca38e002257dd015019c242ec1a6ed6c7617634..d2db6cf541de00f24519cd49463ec915f6bd617f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1612,8 +1612,14 @@ if test "$OPENSSL_ENABLED" != "1" -a "$GNUTLS_ENABLED" != "1"; then
           version="unknown"
         fi
       fi
+    else        
+        # Without pkg-config, we'll kludge in some defaults     
+        addlib="-L$OPT_NSS/lib -lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl"    
+        addcflags="-I$OPT_NSS/include"  
+        version="unknown"       
+        nssprefix=$OPT_NSS
     fi
-
+       
     dnl Check for functionPK11_CreateGenericObject
     dnl this is needed for using the PEM PKCS#11 module
     AC_CHECK_LIB(nss3, PK11_CreateGenericObject,