changeset 21328:daf85e00658b

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.
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 11 Nov 2007 16:30:46 +0000
parents 97dc2a474513
children a04a0d3f9b4f
files configure.ac
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 <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 @@
 		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=""