diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-02 19:45:26 -0700 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-02 19:45:26 -0700 |
| commit | 8e9e2b7d9e54744cee32b3724391bf0ad04e8aff (patch) | |
| tree | 6cafdc57bb8143306daf8ef8288d09754f39b451 /configure | |
| parent | 88de0c96136313e553113f69cfc6ae544a5f5954 (diff) | |
| parent | 2af3e232ff468b288dd4e0dbdab1a17312d801c5 (diff) | |
Merging mainline, which includes a huge msnp13 merge.
Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -424,6 +424,12 @@ if [ "$ret" = "0" ]; then exit 1 fi; +if [ "$msn" = "1" -a "$ssl" != "openssl" ]; then + # Needed for MSN only. OpenSSL exports nice cipher functions already, + # others don't, so use our own 3des code. + echo 'DES=des.o' >> Makefile.settings +fi + echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings if detect_resolv_dynamic || detect_resolv_static; then |