diff options
author | Tomasz Wasilczyk <twasilczyk@pidgin.im> | 2014-11-04 21:37:38 +0100 |
---|---|---|
committer | Tomasz Wasilczyk <twasilczyk@pidgin.im> | 2014-11-04 21:37:38 +0100 |
commit | 2d5d235232f7b4f28cb2f95823ca4ca7b9ad408f (patch) | |
tree | 588b4b86dc2a7c16e8730a7016eb868899254026 | |
parent | 8341ed241ef500f5b863551243b4f29d7d8e0018 (diff) | |
download | pidgin-2d5d235232f7b4f28cb2f95823ca4ca7b9ad408f.tar.gz |
Don't use GnuTLS, if it's disabled. Fixes #16431
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | libpurple/protocols/gg/lib/config.h | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,6 +1,10 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul version 2.10.11 (?/?/?): + Gadu-Gadu: + * Fix a bug that prevented plugin to load when compiled without GnuTLS. + (mancha) (#16431) + General: * Fix handling of Self-Signed SSL/TLS Certificates when using the NSS plugin (#16412) diff --git a/libpurple/protocols/gg/lib/config.h b/libpurple/protocols/gg/lib/config.h index 3a5dbe3788..1d29bb0e79 100644 --- a/libpurple/protocols/gg/lib/config.h +++ b/libpurple/protocols/gg/lib/config.h @@ -49,7 +49,7 @@ /* Defined if libgadu was compiled and linked with GnuTLS support. */ #undef GG_CONFIG_HAVE_GNUTLS -#ifdef HAVE_GNUTLS_2_10 +#if defined(HAVE_GNUTLS) && defined(HAVE_GNUTLS_2_10) # define GG_CONFIG_HAVE_GNUTLS #endif |