im.pidgin.pidgin: c64e6b5a8206103e98869435a6dd5a46ef897984

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: c64e6b5a8206103e98869435a6dd5a46ef897984
Ancestor: 521a02708a29c2d4c933477bab544075f089526f
Author: nosnilmot at pidgin.im
Date: 2007-11-11T16:30:46
Branch: im.pidgin.pidgin

Modified files:
        configure.ac

ChangeLog: 

Some versions of libgadu use __GG_LIBGADU_HAVE_OPENSSL, others use
GG_CONFIG_HAVE_OPENSSL to define if it is linked with OpenSSL, so we need
to check for both to avoid linking with it.


-------------- next part --------------
============================================================
--- configure.ac	317f1806d9a3e17c165f984e1a7d14b19b5f1349
+++ configure.ac	fa4b2ccb93ecb3b2d2134b62a742915a6f1705c8
@@ -900,7 +900,7 @@ if test "x$gadu_libs" = "xyes"; then
 	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
 	], [
@@ -912,10 +912,11 @@ if test "x$gadu_libs" = "xyes"; then
 		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=""