From 6577a6f50dba6e41d590fa23bf51a461cf1d53dd Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Tue, 4 Jun 2013 21:36:23 +0300 Subject: [PATCH] purple: make it compile against 3.0.X API Header check in configure.ac needs a version check because purple_cipher_context_encrypt() has changed. --- configure.ac | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ccb4cd39..8f0b5ac9 100644 --- a/configure.ac +++ b/configure.ac @@ -281,8 +281,10 @@ AS_IF([test "x$enable_purple" != xno], CFLAGS="$PURPLE_CFLAGS $QUALITY_CFLAGS" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[ +#include #include #include +#include /* Compile some code that has caused trouble in the past */ static void testfunc(unsigned long len) @@ -291,10 +293,15 @@ static void testfunc(unsigned long len) guchar *plaintext = NULL; gsize plaintext_length = 0; guchar *encrypted_text = NULL; - gsize dummy; + gsize dummy = 0; purple_cipher_context_set_option(rc4, "key_len", GUINT_TO_POINTER(len)); purple_cipher_context_encrypt(rc4, plaintext, plaintext_length, - encrypted_text, &dummy); + encrypted_text, +#if PURPLE_VERSION_CHECK(3,0,0) + dummy); +#else + &dummy); +#endif } ]], [[testfunc(16);]])], -- 2.11.4.GIT