diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-02-10 16:30:51 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-02-23 09:23:37 +0000 |
| commit | aceba1e1af7ba63d29f35022741d3c764df63983 (patch) | |
| tree | cf21fe28e47038e1313d5c1fb5ef054fc875a460 /RepositoryExternal.mk | |
| parent | a9b4c7b31da1b98280203c61d58261d1ffbb8b77 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index da85d052ffd5..48c687267a3e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3391,7 +3391,7 @@ endef endif # ENABLE_BREAKPAD -ifneq ($(SYSTEM_GPGME),) +ifneq ($(SYSTEM_GPGMEPP),) gb_ExternalProject__use_gpgme:= gb_ExternalProject__use_libassuan:= @@ -3400,11 +3400,11 @@ gb_ExternalProject__use_libgpg-error:= define gb_LinkTarget__use_gpgme $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $$(GPGME_CFLAGS) \ + $$(GPGMEPP_CFLAGS) \ ) $(call gb_LinkTarget_add_libs,$(1),\ - $(GPGME_LIBS) \ + $(GPGMEPP_LIBS) \ ) endef |