changeset 2086:3667697d677d

Fix compilation for old loudmouth libraries
author franky
date Fri, 25 Oct 2013 21:27:31 +0200
parents 88b6e9707e02
children 305297d088c2
files mcabber/configure.ac mcabber/mcabber/xmpp.c
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/configure.ac	Thu Oct 24 22:52:01 2013 +0200
+++ b/mcabber/configure.ac	Fri Oct 25 21:27:31 2013 +0200
@@ -154,6 +154,13 @@
 # Check for loudmouth
 PKG_CHECK_MODULES(LOUDMOUTH, loudmouth-1.0 >= 1.4.2)
 
+# Check for lm_ssl_set_cipher_list in loudmouth
+AC_CHECK_LIB(loudmouth-1, lm_ssl_set_cipher_list,
+              AC_DEFINE([HAVE_LM_SSL_CIPHER_LIST], 1,
+                        [Define that loudmouth has lm_ssl_cipher_list]
+                        )
+            )
+
 # Check for libidn
 AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]],
                                    [Support IDN (needs GNU Libidn)]),
--- a/mcabber/mcabber/xmpp.c	Thu Oct 24 22:52:01 2013 +0200
+++ b/mcabber/mcabber/xmpp.c	Fri Oct 25 21:27:31 2013 +0200
@@ -1957,7 +1957,9 @@
   lssl = lm_ssl_new((ssl_fpr ? fpr : NULL), ssl_cb, NULL, NULL);
   if (lssl) {
     lm_ssl_use_starttls(lssl, !ssl, tls);
+#ifdef HAVE_LM_SSL_CIPHER_LIST
     lm_ssl_set_cipher_list(lssl, ssl_ciphers);
+#endif
     lm_connection_set_ssl(lconnection, lssl);
     lm_ssl_unref(lssl);
   } else if (ssl || tls) {