Mercurial > pidgin
diff configure.ac @ 21331:6e23ec8b1634
merge of '0f99eebc17d3efab8dac3d72feb857ab25b06cb7'
and 'a179eb8d8fc4c8bc156bdf775c617e04119282da'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 11 Nov 2007 18:11:46 +0000 |
| parents | a97f24eda509 |
| children | c7f4e49fce71 |
line wrap: on
line diff
--- a/configure.ac Sun Nov 11 16:56:03 2007 +0000 +++ b/configure.ac Sun Nov 11 18:11: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="" @@ -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