- update to 2.3.1 from HEAD

[packages/pidgin.git] / pidgin-libgadu.patch

diff --git a/pidgin-libgadu.patch b/pidgin-libgadu.patch
index e81f445eeb372185749637f6f6fb5ca0b56cb310..d3296ae6c06124f9567c28979dec372e31fc3d55 100644 (file)
--- a/pidgin-libgadu.patch
+++ b/pidgin-libgadu.patch
@@ -1,27 +1,27 @@
-diff -aurN gaim-2.0.0.orig/configure.ac gaim-2.0.0/configure.ac
---- gaim-2.0.0.orig/configure.ac       2006-03-08 22:25:19.000000000 +0100
-+++ gaim-2.0.0/configure.ac    2006-03-10 21:51:36.233940352 +0100
-@@ -319,28 +319,9 @@
+--- pidgin-2.3.0/configure.ac2 2007-12-08 19:18:44.000000000 +0100
++++ pidgin-2.3.0/configure.ac  2007-12-08 19:19:15.000000000 +0100
+@@ -902,29 +902,9 @@
        AC_MSG_CHECKING(for libgadu GPL compatibility)
        CPPFLAGS_save="$CPPFLAGS"
        CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
 -      AC_TRY_COMPILE([#include <libgadu.h>], [
--#ifdef __GG_LIBGADU_HAVE_OPENSSL
+-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
 -#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
 -#endif
 -      ], [
                AC_MSG_RESULT(yes)
                AC_DEFINE([HAVE_LIBGADU], [1],
-                         [Define to 1 if you have libgadu.])
+                       [Define to 1 if you have libgadu.])
 -      ], [
 -              AC_MSG_RESULT(no)
 -              echo
 -              echo
 -              echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
--              echo "Please recompile libgadu using:"
+-              echo "To compile against system libgadu, please recompile libgadu using:"
 -              echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
 -              echo "Then rerun this ./configure"
 -              echo
+-              echo "Falling back to using our own copy of libgadu"
 -              echo
 -              GADU_LIBS=""
 -              GADU_CFLAGS=""