apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Roy T. Fielding" <field...@gbiv.com>
Subject Re: svn commit: r1211334 - in /apr/apr-util/branches/1.4.x/crypto: apr_crypto_nss.c apr_crypto_nss.dsp
Date Wed, 07 Dec 2011 18:17:18 GMT
Just to confirm, this only gets compiled if the user has added a --with
option specific to nss, right?  Otherwise it impacts our license.

....Roy


On Dec 7, 2011, at 12:38 AM, mturk@apache.org wrote:

> Author: mturk
> Date: Wed Dec  7 08:38:54 2011
> New Revision: 1211334
> 
> URL: http://svn.apache.org/viewvc?rev=1211334&view=rev
> Log:
> Add nspr4.lib as dependency
> 
> Modified:
>    apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c
>    apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp
> 
> Modified: apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c
> URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c?rev=1211334&r1=1211333&r2=1211334&view=diff
> ==============================================================================
> --- apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c (original)
> +++ apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c Wed Dec  7 08:38:54 2011
> @@ -57,6 +57,7 @@ struct apr_crypto_t {
> };
> 
> struct apr_crypto_config_t {
> +	int _unused;
> };
> 
> struct apr_crypto_key_t {
> 
> Modified: apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp
> URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp?rev=1211334&r1=1211333&r2=1211334&view=diff
> ==============================================================================
> --- apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp (original)
> +++ apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.dsp Wed Dec  7 08:38:54 2011
> @@ -54,8 +54,8 @@ BSC32=bscmake.exe
> # ADD BASE BSC32 /nologo
> # ADD BSC32 /nologo
> LINK32=link.exe
> -# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib
/nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /opt:ref
> -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo
/base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"Release\apr_crypto_nss-1.dll"
/pdb:"Release\apr_crypto_nss-1.pdb" /implib:"Release\apr_crypto_nss-1.lib" /MACHINE:X86 /opt:ref
> +# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib
nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /opt:ref
> +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib
nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"Release\apr_crypto_nss-1.dll"
/pdb:"Release\apr_crypto_nss-1.pdb" /implib:"Release\apr_crypto_nss-1.lib" /MACHINE:X86 /opt:ref
> # Begin Special Build Tool
> TargetPath=Release\apr_crypto_nss-1.dll
> SOURCE="$(InputPath)"
> @@ -86,8 +86,8 @@ BSC32=bscmake.exe
> # ADD BASE BSC32 /nologo
> # ADD BSC32 /nologo
> LINK32=link.exe
> -# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib
/nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug
> -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo
/base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\apr_crypto_nss-1.dll"
/pdb:"Debug\apr_crypto_nss-1.pdb" /implib:"Debug\apr_crypto_nss-1.lib" /MACHINE:X86
> +# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib
nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug
> +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib
/nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\apr_crypto_nss-1.dll"
/pdb:"Debug\apr_crypto_nss-1.pdb" /implib:"Debug\apr_crypto_nss-1.lib" /MACHINE:X86
> # Begin Special Build Tool
> TargetPath=Debug\apr_crypto_nss-1.dll
> SOURCE="$(InputPath)"
> @@ -118,8 +118,8 @@ BSC32=bscmake.exe
> # ADD BASE BSC32 /nologo
> # ADD BSC32 /nologo
> LINK32=link.exe
> -# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib
/nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /opt:ref
> -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo
/base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\apr_crypto_nss-1.dll"
/pdb:"x64\Release\apr_crypto_nss-1.pdb" /implib:"x64\Release\apr_crypto_nss-1.lib" /MACHINE:X64
/opt:ref
> +# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib
nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /opt:ref
> +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib
/nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\apr_crypto_nss-1.dll"
/pdb:"x64\Release\apr_crypto_nss-1.pdb" /implib:"x64\Release\apr_crypto_nss-1.lib" /MACHINE:X64
/opt:ref
> # Begin Special Build Tool
> TargetPath=x64\Release\apr_crypto_nss-1.dll
> SOURCE="$(InputPath)"
> @@ -150,8 +150,8 @@ BSC32=bscmake.exe
> # ADD BASE BSC32 /nologo
> # ADD BSC32 /nologo
> LINK32=link.exe
> -# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib
/nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug
> -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib /nologo
/base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\apr_crypto_nss-1.dll"
/pdb:"x64\Debug\apr_crypto_nss-1.pdb" /implib:"x64\Debug\apr_crypto_nss-1.lib" /MACHINE:X64
> +# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib
nspr4.lib /nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug
> +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib nss3.lib nspr4.lib
/nologo /base:"0x6F110000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\apr_crypto_nss-1.dll"
/pdb:"x64\Debug\apr_crypto_nss-1.pdb" /implib:"x64\Debug\apr_crypto_nss-1.lib" /MACHINE:X64
> # Begin Special Build Tool
> TargetPath=x64\Debug\apr_crypto_nss-1.dll
> SOURCE="$(InputPath)"
> 
> 


Mime
View raw message