Commit eb16c0e1 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

- 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.
parent 9c49e51f

CHANGES

+7 −0
Original line number Diff line number Diff line
@@ -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

RELEASE-NOTES

+2 −1
Original line number Diff line number Diff line
@@ -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)

configure.ac

+7 −1
Original line number Diff line number Diff line
@@ -1612,6 +1612,12 @@ 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