--------------------- PatchSet 8291 Date: 2006/06/24 19:25:50 Author: serassio Branch: nt Tag: (none) Log: Fixed build error using OpenSSL Members: port/win32/NCSA_auth/NCSA_auth.dsp:1.1.34.3->1.1.34.4 port/win32/digest_ldap_auth/digest_ldap_auth.dsp:1.1.2.2->1.1.2.3 port/win32/digest_pw_auth/digest_pw_auth.dsp:1.1.2.2->1.1.2.3 Index: squid/port/win32/NCSA_auth/NCSA_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/NCSA_auth/Attic/NCSA_auth.dsp,v retrieving revision 1.1.34.3 retrieving revision 1.1.34.4 diff -u -r1.1.34.3 -r1.1.34.4 --- squid/port/win32/NCSA_auth/NCSA_auth.dsp 24 Jun 2006 19:09:15 -0000 1.1.34.3 +++ squid/port/win32/NCSA_auth/NCSA_auth.dsp 24 Jun 2006 19:25:50 -0000 1.1.34.4 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ws2_32.lib psapi.lib /nologo /subsystem:console /machine:I386 /IGNORE:4089 +# ADD LINK32 ws2_32.lib psapi.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /machine:I386 /IGNORE:4089 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "NCSA_auth - Win32 Debug" @@ -75,7 +75,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ws2_32.lib psapi.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib psapi.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF Index: squid/port/win32/digest_ldap_auth/digest_ldap_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/digest_ldap_auth/Attic/digest_ldap_auth.dsp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid/port/win32/digest_ldap_auth/digest_ldap_auth.dsp 24 Jun 2006 19:09:15 -0000 1.1.2.2 +++ squid/port/win32/digest_ldap_auth/digest_ldap_auth.dsp 24 Jun 2006 19:25:50 -0000 1.1.2.3 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Wldap32.lib ws2_32.lib psapi.lib /nologo /subsystem:console /machine:I386 /IGNORE:4089 +# ADD LINK32 Wldap32.lib ws2_32.lib psapi.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /machine:I386 /IGNORE:4089 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "digest_ldap_auth - Win32 Debug" @@ -75,7 +75,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Wldap32.lib ws2_32.lib psapi.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 Wldap32.lib ws2_32.lib psapi.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # SUBTRACT LINK32 /nodefaultlib !ENDIF Index: squid/port/win32/digest_pw_auth/digest_pw_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/digest_pw_auth/Attic/digest_pw_auth.dsp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid/port/win32/digest_pw_auth/digest_pw_auth.dsp 24 Jun 2006 19:09:15 -0000 1.1.2.2 +++ squid/port/win32/digest_pw_auth/digest_pw_auth.dsp 24 Jun 2006 19:25:50 -0000 1.1.2.3 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ws2_32.lib psapi.lib /nologo /subsystem:console /machine:I386 /IGNORE:4089 +# ADD LINK32 ws2_32.lib psapi.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /machine:I386 /IGNORE:4089 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "digest_pw_auth - Win32 Debug" @@ -75,7 +75,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ws2_32.lib psapi.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib psapi.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF