qulogic/pidgin

Gadu-Gadu: revert things accidentally removed, fix build
release-2.x.y
2014-06-17, Tomasz Wasilczyk
99a1117a296f
Parents f1c54a78d896
Children 747e73eab85988dcb1854782c4ebf4d738f9
Gadu-Gadu: revert things accidentally removed, fix build
3 files changed, 30 insertions(+), 10 deletions(-)
  • +28 -0
    configure.ac
  • +2 -6
    libpurple/protocols/gg/Makefile.am
  • +0 -4
    pidgin/Makefile.am
    • --- a/configure.ac Tue Jun 17 00:03:58 2014 +0200
    +++ b/configure.ac Tue Jun 17 01:43:39 2014 +0200
    @@ -1048,6 +1048,34 @@
    AM_CONDITIONAL(HAVE_LIBGADU, test "x$have_libgadu" = "xyes")
    if test "x$have_libgadu" = "xyes"; then
    AC_DEFINE(HAVE_LIBGADU, 1, [Linked with external libgadu])
    +else
    + AC_CHECK_LIB(gnutls, gnutls_certificate_set_x509_system_trust, [gg_have_gnutls_csxst=yes], [gg_have_gnutls_csxst=no])
    +
    + gg_gnutls_sts=""
    + if test "x$gg_have_gnutls_csxst" = "xno"; then
    + for i in /etc/ssl/ca-bundle.pem \
    + /etc/ssl/certs/ca-certificates.crt \
    + /etc/pki/tls/cert.pem \
    + /usr/local/share/certs/ca-root-nss.crt \
    + /etc/ssl/cert.pem
    + do
    + if test -e $i; then
    + gg_gnutls_sts="$i"
    + break
    + fi
    + done
    + fi
    +
    + if test "x$gg_have_gnutls_csxst" = "xyes"; then
    + AC_DEFINE(HAVE_GNUTLS_CERTIFICATE_SET_X509_SYSTEM_TRUST, 1, [gnutls contains the gnutls_certificate_set_x509_system_trust function])
    + fi
    + if test "x$gg_gnutls_sts" != "x"; then
    + AC_DEFINE_UNQUOTED(GG_CONFIG_GNUTLS_SYSTEM_TRUST_STORE, ["$gg_gnutls_sts"], [use the given file as GnuTLS default trust store])
    + fi
    +
    + PKG_CHECK_MODULES([GNUTLS_2_10], [gnutls >= 2.10.0], [
    + AC_DEFINE([HAVE_GNUTLS_2_10], [], [Defined if GnuTLS >= 2.10.0 is available.])
    + ],:)
    fi
    AC_SUBST(LIBGADU_LIBS)
    --- a/libpurple/protocols/gg/Makefile.am Tue Jun 17 00:03:58 2014 +0200
    +++ b/libpurple/protocols/gg/Makefile.am Tue Jun 17 01:43:39 2014 +0200
    @@ -89,17 +89,13 @@
    lib/tvbuilder.c \
    lib/tvbuilder.h
    -INTGG_LIBS = $(ZLIB_LIBS)
    +INTGG_LIBS = $(ZLIB_LIBS) $(GNUTLS_LIBS)
    INTGG_CFLAGS = \
    -I$(top_srcdir)/libpurple/protocols/gg/lib \
    $(ZLIB_CFLAGS) \
    + $(GNUTLS_CFLAGS) \
    -DGG_IGNORE_DEPRECATED
    -if USE_GNUTLS
    - INTGG_LIBS += $(GNUTLS_LIBS)
    - INTGG_CFLAGS += $(GNUTLS_CFLAGS)
    -endif
    -
    endif
    GGSOURCES = \
    --- a/pidgin/Makefile.am Tue Jun 17 00:03:58 2014 +0200
    +++ b/pidgin/Makefile.am Tue Jun 17 01:43:39 2014 +0200
    @@ -160,10 +160,6 @@
    $(GTK_LIBS) \
    $(top_builddir)/libpurple/libpurple.la
    -if USE_INTERNAL_LIBGADU
    -INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
    -endif
    -
    AM_CPPFLAGS = \
    -DDATADIR=\"$(datadir)\" \
    -DLIBDIR=\"$(libdir)/pidgin/\" \