Changeset 83e47ec for configure

Timestamp:

2010-10-17T06:44:35Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

79b5c41

Parents:

3fc6c32

Message:

Use gcrypt for 3DES encryption (used for new MSN authentication) so we
mostly don't need lib/des.c anymore.

File:

• configure (modified) (3 diffs)

configure

@@ -269 +269 @@
         if $PKG_CONFIG --exists gnutls; then
                 cat <<EOF>>Makefile.settings
-EFLAGS+=`$PKG_CONFIG --libs gnutls`
-CFLAGS+=`$PKG_CONFIG --cflags gnutls`
+EFLAGS+=`$PKG_CONFIG --libs gnutls` `libgcrypt-config --libs`
+CFLAGS+=`$PKG_CONFIG --cflags gnutls` `libgcrypt-config --cflags`
 EOF
                 ssl=gnutls
@@ -276 +276 @@
         elif libgnutls-config --version > /dev/null 2> /dev/null; then
                 cat <<EOF>>Makefile.settings
-EFLAGS+=`libgnutls-config --libs`
-CFLAGS+=`libgnutls-config --cflags`
+EFLAGS+=`libgnutls-config --libs` `libgcrypt-config --libs`
+CFLAGS+=`libgnutls-config --cflags` `libgcrypt-config --cflags`
 EOF
                 
@@ -427 +427 @@
 fi;
 
-if [ "$msn" = "1" -a "$ssl" != "openssl" ]; then
+if [ "$msn" = "1" -a "$ssl" != "openssl" -a "$ssl" != "gnutls" ]; then
         # Needed for MSN only. OpenSSL exports nice cipher functions already,
-        # others don't, so use our own 3des code.
+        # in case of GnuTLS we should be able to use gcrypt. Otherwise, use
+        # built-in stuff. (Since right now those are the only two supported
+        # SSL modules anyway, this is mostly unnecessary.)
         echo 'DES=des.o' >> Makefile.settings
 fi