/pidgin/main: 426067e03cfc: Fix build with gnutls < 2.10

Tomasz Wasilczyk twasilczyk at pidgin.im
Sat Mar 1 19:45:32 EST 2014


Changeset: 426067e03cfcc3ce840cdcae5c26f829f00aa81e
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-03-02 01:45 +0100
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/426067e03cfc

Description:

Fix build with gnutls < 2.10

diffstat:

 configure.ac                        |  3 +++
 libpurple/protocols/gg/lib/config.h |  2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diffs (25 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1133,6 +1133,9 @@ if test "x$gadu_libs" != "xyes"; then
 		AC_DEFINE_UNQUOTED(GG_CONFIG_GNUTLS_SYSTEM_TRUST_STORE, ["$gg_gnutls_sts"], [use the given file as GnuTLS default trust store])
 	fi
 
+	PKG_CHECK_MODULES([GNUTLS_2_10], [gnutls >= 2.10.0], [
+		AC_DEFINE([HAVE_GNUTLS_2_10], [], [Defined if GnuTLS >= 2.10.0 is available.])
+	])
 fi
 
 if test "x$gadu_libs" = "x"; then
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
+#ifdef HAVE_GNUTLS_2_10
 #  define GG_CONFIG_HAVE_GNUTLS
 #endif
 



More information about the Commits mailing list