Mercurial > pidgin.yaz
diff configure.ac @ 21431:5dddaf6e6136
propagate from branch 'im.pidgin.pidgin' (head d2826de9438a8a8756c77368c1f585807a3984d0)
to branch 'im.pidgin.cpw.resiak.disconnectreason' (head 583a04601ea4d2794327f5e811d1bcaeb0662c7c)
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Sun, 11 Nov 2007 22:31:16 +0000 |
| parents | a97f24eda509 |
| children | c7f4e49fce71 |
line wrap: on
line diff
--- a/configure.ac Sun Nov 11 22:29:39 2007 +0000 +++ b/configure.ac Sun Nov 11 22:31:16 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="" @@ -2262,7 +2263,6 @@ libpurple/tests/Makefile libpurple/purple.h libpurple/version.h - share/Makefile share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc