From aceba1e1af7ba63d29f35022741d3c764df63983 Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Fri, 10 Feb 2017 16:30:51 +0100 Subject: gpg4libre: We want to use C++ library instead in particular, the one from gpgme project. configure check is set up in such a way that it will fail with older gpgmepp that depends on KDE development packages. This means Linux distros released before 2016 have to rely upon in-tree version, but such is life ... Change-Id: I5cdceffad6e81643603fcdee57a7656218f76834 Reviewed-on: https://gerrit.libreoffice.org/34130 Tested-by: Jenkins Reviewed-by: Siegmund Gorr Reviewed-by: Thorsten Behrens --- config_host.mk.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config_host.mk.in') diff --git a/config_host.mk.in b/config_host.mk.in index 1dfca596b5cf..5c35440ed0ad 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -204,8 +204,8 @@ export EPOXY_LIBS=$(gb_SPACE)@EPOXY_LIBS@ export GLM_CFLAGS=$(gb_SPACE)@GLM_CFLAGS@ export GPG_ERROR_CFLAGS=$(gb_SPACE)@GPG_ERROR_CFLAGS@ export GPG_ERROR_LIBS=$(gb_SPACE)@GPG_ERROR_LIBS@ -export GPGME_CFLAGS=$(gb_SPACE)@GPGME_CFLAGS@ -export GPGME_LIBS=$(gb_SPACE)@GPGME_LIBS@ +export GPGMEPP_CFLAGS=$(gb_SPACE)@GPGMEPP_CFLAGS@ +export GPGMEPP_LIBS=$(gb_SPACE)@GPGMEPP_LIBS@ export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@ export GNUTLS_LIBS=$(gb_SPACE)@GNUTLS_LIBS@ export PARALLELISM?=@PARALLELISM@ @@ -510,7 +510,7 @@ export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@ export SYSTEM_GENCMN=@SYSTEM_GENCMN@ export SYSTEM_EPOXY=@SYSTEM_EPOXY@ export SYSTEM_GLM=@SYSTEM_GLM@ -export SYSTEM_GPGME=@SYSTEM_GPGME@ +export SYSTEM_GPGMEPP=@SYSTEM_GPGMEPP@ export SYSTEM_GRAPHITE=@SYSTEM_GRAPHITE@ export SYSTEM_HARFBUZZ=@SYSTEM_HARFBUZZ@ export SYSTEM_HSQLDB=@SYSTEM_HSQLDB@ -- cgit v1.2.3