Author: rotom Date: Sun Dec 9 08:14:49 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up to 2.3.0
---- Files affected:
SOURCES:
pidgin-libgadu.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/pidgin-libgadu.patch
diff -u SOURCES/pidgin-libgadu.patch:1.3 SOURCES/pidgin-libgadu.patch:1.4
--- SOURCES/pidgin-libgadu.patch:1.3 Fri Mar 23 16:38:10 2007
+++ SOURCES/pidgin-libgadu.patch Sun Dec 9 09:14:43 2007
@@ -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
-@@ -631,28 +631,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=""
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/pidgin-libgadu.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
