diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-12 19:10:16 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-12 19:10:16 +0000 |
| commit | be609ff2b0ca885612c0e6d81f82c4f26ed4f58d (patch) | |
| tree | b9f83fdc44bd00921ffb9c23035b1f39d565ba93 /configure | |
| parent | 08e5bb2bb2fcc7125f837be4f225d3a9ebf320ed (diff) | |
| parent | 8b6b7405d3844271f7bff56e527bfeb1a4872975 (diff) | |
Merging mainline.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -359,11 +359,11 @@ elif [ "$ssl" = "bogus" ]; then echo 'Using bogus SSL code. This means some features will not work properly.' ## Yes, you, at the console! How can you authenticate if you don't have any SSL!? - if [ "$msn" = "1" ]; then + if [ "$msn" = "1" -o "$yahoo" = "1" ]; then echo - echo 'Real SSL support is necessary for MSN authentication, will build without' - echo 'MSN protocol support.' + echo 'WARNING: The MSN and Yahoo! modules will not work without SSL. Disabling.' msn=0 + yahoo=0 fi ret=1 |