# HG changeset patch # User Stu Tomlinson # Date 1194798646 0 # Node ID daf85e00658bbcb092774431d4f3b2b25830b425 # Parent 97dc2a474513882ee4b7d604bf2a3ccfafda4b11 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. diff -r 97dc2a474513 -r daf85e00658b configure.ac --- a/configure.ac Sun Nov 11 15:57:35 2007 +0000 +++ b/configure.ac Sun Nov 11 16:30:46 2007 +0000 @@ -900,7 +900,7 @@ CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $GADU_CFLAGS" AC_TRY_COMPILE([#include ], [ -#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 @@ 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=""