/pidgin/main: ca3ea8900dc9: Don't use GnuTLS, if it's disabled. ...
Tomasz Wasilczyk <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: ca3ea8900dc927b6788b88614c004c8ef699c300 Author: Tomasz Wasilczyk <[email protected]> Date: 2014-11-04 21:37 +0100 Branch: release-2.x.y URL: https://hg.pidgin.im/pidgin/main/rev/ca3ea8900dc9 Description: Don't use GnuTLS, if it's disabled. Fixes #16431 diffstat: ChangeLog | 4 ++++ libpurple/protocols/gg/lib/config.h | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diffs (26 lines): diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -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 --- 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