Changeset 8e9e2b7 for configure

Timestamp:

2010-10-03T02:45:26Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

04f0c10

Parents:

88de0c9 (diff), 2af3e23 (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:

Merging mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

File:

• configure (modified) (1 diff)

configure

@@ -425 +425 @@
 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