Changeset b006464 for configure

Timestamp:

2012-11-17T23:51:21Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5aa96fc8

Parents:

d1356cb (diff), e1d3f98 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline.

File:

• configure (modified) (3 diffs)

configure

@@ -91 +91 @@
 
 --events=...    Event handler (glib, libevent)          $events
---ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
+--ssl=...       SSL library to use (gnutls, nss, openssl, auto)
                                                         $ssl
 
@@ -434 +434 @@
         
         ret=1
-elif [ "$ssl" = "bogus" ]; then
-        echo
-        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" -o "$yahoo" = "1" ]; then
-                echo
-                echo 'WARNING: The MSN and Yahoo! modules will not work without SSL. Disabling.'
-                msn=0
-                yahoo=0
-        fi
-        
-        ret=1
 else
         echo
@@ -457 +444 @@
         echo 'ERROR: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).'
         echo '       Please note that this script doesn'\''t have detection code for OpenSSL,'
-        echo '       so if you want to use that, you have to select it by hand. If you don'\''t'
-        echo '       need SSL support, you can select the "bogus" SSL library. (--ssl=bogus)'
+        echo '       so if you want to use that, you have to select it by hand.'
         
         exit 1